yikesinc / yikes-inc-easy-mailchimp-extender

public/class-yikes-inc-easy-mailchimp-extender-public.php

Spacing +34 added lines, -34 removed lines

@@ -46,7 +46,7 @@ 
 		 * 	@since 6.0.0
 		 */
 		if ( ! defined( 'YIKES_MC_VERSION' ) ) {
-			define( 'YIKES_MC_VERSION' , $version );
+			define( 'YIKES_MC_VERSION', $version );
 		}
 		/*
 		*	Include our helper functions
@@ -63,9 +63,9 @@ 
 		// include our ajax processing class
 		require_once( YIKES_MC_PATH . 'public/partials/ajax/class.public_ajax.php' );
 		// Include our error logging class
-		add_action( 'init' , array( $this , 'load_error_logging_class' ) , 1 );
+		add_action( 'init', array( $this, 'load_error_logging_class' ), 1 );
 		// load our checkbox classes
-		add_action( 'init' , array( $this , 'load_checkbox_integration_classes' ) , 1 );
+		add_action( 'init', array( $this, 'load_checkbox_integration_classes' ), 1 );
 		// custom front end filter
 		add_action( 'init', array( $this, 'yikes_custom_frontend_content_filter' ) );
 		// Process non-ajax forms in the header
@@ -98,15 +98,15 @@ 
 	**/
 	public function load_checkbox_integration_classes() {
 		// store our options
-		$integrations = get_option( 'optin-checkbox-init' , '' );
-		if( !empty( $integrations ) ) {
+		$integrations = get_option( 'optin-checkbox-init', '' );
+		if ( ! empty( $integrations ) ) {
 			// load our mail integrations class
 			require_once YIKES_MC_PATH . 'public/classes/checkbox-integrations.php';
 			// loop over selected classes and load them up!
-			foreach( $integrations as $integration => $value ) {
-				if( isset( $value['value'] ) && $value['value'] == 'on' ) {
+			foreach ( $integrations as $integration => $value ) {
+				if ( isset( $value[ 'value' ] ) && $value[ 'value' ] == 'on' ) {
 					// load our class extensions
-					require_once YIKES_MC_PATH . 'public/classes/checkbox-integrations/class.'.$integration.'-checkbox.php';
+					require_once YIKES_MC_PATH . 'public/classes/checkbox-integrations/class.' . $integration . '-checkbox.php';
 				}
 			}
 		}
@@ -120,7 +120,7 @@ 
 	 * @since 6.0.0
 	 */
 	public function load_error_logging_class() {
-		if( get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+		if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 			// if error logging is enabled we should include our error logging class
 			require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging;
@@ -133,18 +133,18 @@ 
 	*	@since 6.0.3.4
 	*/
 	public function yikes_process_non_ajax_forms( $form_submitted ) {
-		global $wpdb,$post;
-		$form_id = ( ! empty( $_POST['yikes-mailchimp-submitted-form'] ) ) ? (int) $_POST['yikes-mailchimp-submitted-form'] : false; // store form id
-		if( $form_id ) {
+		global $wpdb, $post;
+		$form_id = ( ! empty( $_POST[ 'yikes-mailchimp-submitted-form' ] ) ) ? (int) $_POST[ 'yikes-mailchimp-submitted-form' ] : false; // store form id
+		if ( $form_id ) {
 			$form_settings = self::yikes_retrieve_form_settings( $form_id );
-			if( isset( $_POST ) && !empty( $_POST ) && isset( $form_id ) && $form_settings['submission_settings']['ajax'] == 0 ) {
-				if( $_POST['yikes-mailchimp-submitted-form'] == $form_id ) { // ensure we only process the form that was submitted
+			if ( isset( $_POST ) && ! empty( $_POST ) && isset( $form_id ) && $form_settings[ 'submission_settings' ][ 'ajax' ] == 0 ) {
+				if ( $_POST[ 'yikes-mailchimp-submitted-form' ] == $form_id ) { // ensure we only process the form that was submitted
 					// lets include our form processing file
 					include_once( YIKES_MC_PATH . 'public/partials/shortcodes/process/process_form_submission.php' );
-					if( $form_settings['submission_settings']['redirect_on_submission'] == '1' ) {
-						if( $form_submitted == 1 ) {
+					if ( $form_settings[ 'submission_settings' ][ 'redirect_on_submission' ] == '1' ) {
+						if ( $form_submitted == 1 ) {
 							// decode our settings
-							$redirect_page = ( 'custom_url' != $form_settings['submission_settings']['redirect_page'] ) ? get_permalink( (int) $form_settings['submission_settings']['redirect_page'] ) : $form_settings['submission_settings']['custom_redirect_url'];
+							$redirect_page = ( 'custom_url' != $form_settings[ 'submission_settings' ][ 'redirect_page' ] ) ? get_permalink( (int) $form_settings[ 'submission_settings' ][ 'redirect_page' ] ) : $form_settings[ 'submission_settings' ][ 'custom_redirect_url' ];
 							wp_redirect( apply_filters( 'yikes-mailchimp-redirect-url', esc_url( $redirect_page ), $form_id, $post ) );
 							exit;
 						}
@@ -160,27 +160,27 @@ 
 	*/
 	public static function yikes_retrieve_form_settings( $form_id ) {
 		// if no form id, abort
-		if( ! $form_id ) {
+		if ( ! $form_id ) {
 			return;
 		}
 		global $wpdb;
 		$form_results = $wpdb->get_results( 'SELECT * FROM ' . $wpdb->prefix . 'yikes_easy_mc_forms WHERE id = ' . $form_id . '', ARRAY_A ); // query for our form data
-		if( $form_results ) {
+		if ( $form_results ) {
 			// empty array, to populate with form settings
 			$form_settings = array();
-			$form_data = $form_results[0]; // store the results
+			$form_data = $form_results[ 0 ]; // store the results
 			// store the settings in our array
-			$form_settings['list_id'] = sanitize_key( $form_data['list_id'] ); // associated list id (users who fill out the form will be subscribed to this list)
-			$form_settings['form_name'] = esc_attr( $form_data['form_name'] ); // form name
-			$form_settings['form_description'] = esc_attr( stripslashes( $form_data['form_description'] ) );
-			$form_settings['fields'] = json_decode( $form_data['fields'] , true );
-			$form_settings['styles'] = json_decode( stripslashes( $form_data['custom_styles'] ) , true );
-			$form_settings['send_welcome'] = $form_data['send_welcome_email'];
-			$form_settings['submission_settings'] = json_decode( stripslashes( $form_data['submission_settings'] ) , true );
-			$form_settings['optin_settings'] = json_decode( stripslashes( $form_data['optin_settings'] ) , true );
-			$form_settings['error_messages'] = json_decode( $form_data['error_messages'] , true );
-			$form_settings['notifications'] = isset( $form_data['custom_notifications'] ) ? json_decode( stripslashes( $form_data['custom_notifications'] ) , true ) : '';
-			$form_settings['submissions'] = $form_data['submissions'];
+			$form_settings[ 'list_id' ] = sanitize_key( $form_data[ 'list_id' ] ); // associated list id (users who fill out the form will be subscribed to this list)
+			$form_settings[ 'form_name' ] = esc_attr( $form_data[ 'form_name' ] ); // form name
+			$form_settings[ 'form_description' ] = esc_attr( stripslashes( $form_data[ 'form_description' ] ) );
+			$form_settings[ 'fields' ] = json_decode( $form_data[ 'fields' ], true );
+			$form_settings[ 'styles' ] = json_decode( stripslashes( $form_data[ 'custom_styles' ] ), true );
+			$form_settings[ 'send_welcome' ] = $form_data[ 'send_welcome_email' ];
+			$form_settings[ 'submission_settings' ] = json_decode( stripslashes( $form_data[ 'submission_settings' ] ), true );
+			$form_settings[ 'optin_settings' ] = json_decode( stripslashes( $form_data[ 'optin_settings' ] ), true );
+			$form_settings[ 'error_messages' ] = json_decode( $form_data[ 'error_messages' ], true );
+			$form_settings[ 'notifications' ] = isset( $form_data[ 'custom_notifications' ] ) ? json_decode( stripslashes( $form_data[ 'custom_notifications' ] ), true ) : '';
+			$form_settings[ 'submissions' ] = $form_data[ 'submissions' ];
 			// return the given form settings in an array
 			return $form_settings;
 		}
@@ -199,13 +199,13 @@ 
 			return;
 		}
 		// trim trailing period
-		if ( isset( $form_settings['error_messages']['update-link'] ) && ! empty( $form_settings['error_messages']['update-link'] ) ) {
-			$response_text = $form_settings['error_messages']['update-link'];
+		if ( isset( $form_settings[ 'error_messages' ][ 'update-link' ] ) && ! empty( $form_settings[ 'error_messages' ][ 'update-link' ] ) ) {
+			$response_text = $form_settings[ 'error_messages' ][ 'update-link' ];
 			// extract the link text
 			preg_match( '/\[link].*?\[\/link\]/', $response_text, $link_text );
 			if ( $link_text && ! empty( $link_text ) ) {
 				// Extract the custom link text ([link]*[/link])
-				$custom_link_text = str_replace( '[/link]', '', str_replace( '[link]', '', str_replace( 'click to send yourself an update link', $link_text[0], $link ) ) );
+				$custom_link_text = str_replace( '[/link]', '', str_replace( '[link]', '', str_replace( 'click to send yourself an update link', $link_text[ 0 ], $link ) ) );
 				// Replace the link text, with our custom link text
 				$response_text = str_replace( $link_text, $custom_link_text, $response_text );
 			}

Braces +2 added lines, -1 removed lines

@@ -138,7 +138,8 @@
 		if( $form_id ) {
 			$form_settings = self::yikes_retrieve_form_settings( $form_id );
 			if( isset( $_POST ) && !empty( $_POST ) && isset( $form_id ) && $form_settings['submission_settings']['ajax'] == 0 ) {
-				if( $_POST['yikes-mailchimp-submitted-form'] == $form_id ) { // ensure we only process the form that was submitted
+				if( $_POST['yikes-mailchimp-submitted-form'] == $form_id ) {
+// ensure we only process the form that was submitted
 					// lets include our form processing file
 					include_once( YIKES_MC_PATH . 'public/partials/shortcodes/process/process_form_submission.php' );
 					if( $form_settings['submission_settings']['redirect_on_submission'] == '1' ) {

public/partials/shortcodes/process/process_form_submission.php

Spacing +78 added lines, -78 removed lines

@@ -8,45 +8,45 @@ 
 global $form_submitted, $process_submission_response;
 
 // confirm we have a form id to work with
-$form_id = ( ! empty( $_POST['yikes-mailchimp-submitted-form'] ) ) ? $_POST['yikes-mailchimp-submitted-form'] : false;
-if( ! $form_id ) {
+$form_id = ( ! empty( $_POST[ 'yikes-mailchimp-submitted-form' ] ) ) ? $_POST[ 'yikes-mailchimp-submitted-form' ] : false;
+if ( ! $form_id ) {
 	return;
 }
 
-$form_settings = Yikes_Inc_Easy_Mailchimp_Extender_Public::yikes_retrieve_form_settings( $_POST['yikes-mailchimp-submitted-form'] );
+$form_settings = Yikes_Inc_Easy_Mailchimp_Extender_Public::yikes_retrieve_form_settings( $_POST[ 'yikes-mailchimp-submitted-form' ] );
 
 // Process our form submissions (non ajax forms)
-if ( ! isset( $_POST['yikes_easy_mc_new_subscriber'] ) || ! wp_verify_nonce( $_POST['yikes_easy_mc_new_subscriber'], 'yikes_easy_mc_form_submit' ) ) {
+if ( ! isset( $_POST[ 'yikes_easy_mc_new_subscriber' ] ) || ! wp_verify_nonce( $_POST[ 'yikes_easy_mc_new_subscriber' ], 'yikes_easy_mc_form_submit' ) ) {
 
-    $process_submission_response = '<p><small class="form_submission_error">' . __( "Error : Sorry, the nonce security check didn't pass. Please reload the page and try again. You may want to try clearing your browser cache as a last attempt." , 'yikes-inc-easy-mailchimp-extender' ) . '</small></p>';
+    $process_submission_response = '<p><small class="form_submission_error">' . __( "Error : Sorry, the nonce security check didn't pass. Please reload the page and try again. You may want to try clearing your browser cache as a last attempt.", 'yikes-inc-easy-mailchimp-extender' ) . '</small></p>';
 	return;
 
 } else {
 
 	/* Check for Honeypot filled */
-	$honey_pot_filled = ( isset( $_POST['yikes-mailchimp-honeypot'] ) && $_POST['yikes-mailchimp-honeypot'] != '' ) ? true : false;
+	$honey_pot_filled = ( isset( $_POST[ 'yikes-mailchimp-honeypot' ] ) && $_POST[ 'yikes-mailchimp-honeypot' ] != '' ) ? true : false;
 	// if it was filled out, return an error...
 	if ( $honey_pot_filled ) {
-		$process_submission_response = '<p><small class="form_submission_error">' . __( "Error: It looks like the honeypot was filled out and the form was not properly be submitted." , 'yikes-inc-easy-mailchimp-extender' ) . '</small></p>';
+		$process_submission_response = '<p><small class="form_submission_error">' . __( "Error: It looks like the honeypot was filled out and the form was not properly be submitted.", 'yikes-inc-easy-mailchimp-extender' ) . '</small></p>';
 		return;
 	}
 
 	// Check reCAPTCHA Response
-	if( isset( $_POST['g-recaptcha-response'] ) ) {
-		$url = esc_url_raw( 'https://www.google.com/recaptcha/api/siteverify?secret=' . get_option( 'yikes-mc-recaptcha-secret-key' , '' ) . '&response=' . $_POST['g-recaptcha-response'] . '&remoteip=' . $_SERVER["REMOTE_ADDR"] );
+	if ( isset( $_POST[ 'g-recaptcha-response' ] ) ) {
+		$url = esc_url_raw( 'https://www.google.com/recaptcha/api/siteverify?secret=' . get_option( 'yikes-mc-recaptcha-secret-key', '' ) . '&response=' . $_POST[ 'g-recaptcha-response' ] . '&remoteip=' . $_SERVER[ "REMOTE_ADDR" ] );
 		$response = wp_remote_get( $url );
-		$response_body = json_decode( $response['body'] , true );
+		$response_body = json_decode( $response[ 'body' ], true );
 
 		// if we've hit an error, lets return the error!
-		if( $response_body['success'] != 1 ) {
+		if ( $response_body[ 'success' ] != 1 ) {
 			$recaptcha_error = array(); // empty array to store error messages
-			foreach( $response_body['error-codes'] as $error_code ) {
-				if( $error_code == 'missing-input-response' ) {
+			foreach ( $response_body[ 'error-codes' ] as $error_code ) {
+				if ( $error_code == 'missing-input-response' ) {
 					$error_code = __( 'Please check the reCAPTCHA field.', 'yikes-inc-easy-mailchimp-extender' );
 				}
-				$recaptcha_error[] = $error_code;
+				$recaptcha_error[ ] = $error_code;
 			}
-			$process_submission_response .= "<p class='yikes-easy-mc-error-message'>" . apply_filters( 'yikes-mailchimp-recaptcha-required-error', __( 'Error' , 'yikes-inc-easy-mailchimp-extender' )  . ': ' . implode( ' ' , $recaptcha_error ) ) . "</p>";
+			$process_submission_response .= "<p class='yikes-easy-mc-error-message'>" . apply_filters( 'yikes-mailchimp-recaptcha-required-error', __( 'Error', 'yikes-inc-easy-mailchimp-extender' ) . ': ' . implode( ' ', $recaptcha_error ) ) . "</p>";
 			return;
 		}
 	}
@@ -56,20 +56,20 @@ 
 	*	No HTML5 validation, and don't want to use jQuery for non-ajax forms
 	*/
 	$missing_required_checkbox_interest_groups = array();
-	foreach( $form_settings['fields'] as $merge_tag => $field_data ) {
-		if( is_numeric( $merge_tag ) ) {
+	foreach ( $form_settings[ 'fields' ] as $merge_tag => $field_data ) {
+		if ( is_numeric( $merge_tag ) ) {
 			// check if the checkbox group was set to required, if so return an error
-			if( isset( $field_data['require'] ) && $field_data['require'] == 1 ) {
-				if( $field_data['type'] == 'checkboxes' ) {
-					if( ! isset( $_POST[$merge_tag] ) ) {
-						$missing_required_checkbox_interest_groups[] = $merge_tag;
+			if ( isset( $field_data[ 'require' ] ) && $field_data[ 'require' ] == 1 ) {
+				if ( $field_data[ 'type' ] == 'checkboxes' ) {
+					if ( ! isset( $_POST[ $merge_tag ] ) ) {
+						$missing_required_checkbox_interest_groups[ ] = $merge_tag;
 					}
 				}
 			}
 		}
 	}
 
-	if( ! empty( $missing_required_checkbox_interest_groups ) ) {
+	if ( ! empty( $missing_required_checkbox_interest_groups ) ) {
 		$process_submission_response = '<p class="yikes-easy-mc-error-message">' . apply_filters( 'yikes-mailchimp-interest-group-required-top-error', sprintf( _n( 'It looks like you forgot to fill in a required field.', 'It looks like you forgot to fill in %s required fields.', count( $missing_required_checkbox_interest_groups ), 'yikes-inc-easy-mailchimp-extender' ), count( $missing_required_checkbox_interest_groups ) ), count( $missing_required_checkbox_interest_groups ), $form_id ) . '</p>';
 		return;
 	}
@@ -79,12 +79,12 @@ 
 
 	// loop to push variables to our array
 	foreach ( $_POST as $merge_tag => $value ) {
-		if( $merge_tag != 'yikes_easy_mc_new_subscriber' && $merge_tag != '_wp_http_referer' ) {
+		if ( $merge_tag != 'yikes_easy_mc_new_subscriber' && $merge_tag != '_wp_http_referer' ) {
 			// check if the current iteration has a 'date_format' key set
 			// (aka - date/birthday fields)
-			if( isset( $form_settings['fields'][$merge_tag]['date_format'] ) ) {
+			if ( isset( $form_settings[ 'fields' ][ $merge_tag ][ 'date_format' ] ) ) {
 				// check if EU date format
-				if( $form_settings['fields'][$merge_tag]['date_format'] == 'DD/MM/YYYY' ) {
+				if ( $form_settings[ 'fields' ][ $merge_tag ][ 'date_format' ] == 'DD/MM/YYYY' ) {
 					// convert '/' to '.' and to UNIX timestamp
 					$value = ( '' != $value ) ? date( 'Y-m-d', strtotime( str_replace( '/', '.', $value ) ) ) : '';
 				} else {
@@ -92,23 +92,23 @@ 
 					$value = ( '' != $value ) ? date( 'Y-m-d', strtotime( $value ) ) : '';
 				}
 			}
-			if( is_numeric( $merge_tag ) ) { // this is is an interest group!
-				$merge_variables['groupings'][] = array( 'id' => $merge_tag , 'groups' => ( is_array( $value ) ) ? $value : array( $value ) );
+			if ( is_numeric( $merge_tag ) ) { // this is is an interest group!
+				$merge_variables[ 'groupings' ][ ] = array( 'id' => $merge_tag, 'groups' => ( is_array( $value ) ) ? $value : array( $value ) );
 			} else { // or else it's just a standard merge variable
-				$merge_variables[$merge_tag] = $value;
+				$merge_variables[ $merge_tag ] = $value;
 			}
 		}
 	}
 
 	// store the opt-in time
-	$merge_variables['optin_time'] = current_time( 'Y-m-d H:i:s', 1 );
+	$merge_variables[ 'optin_time' ] = current_time( 'Y-m-d H:i:s', 1 );
 
 	// Submit our form data
-	$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
+	$api_key = trim( get_option( 'yikes-mc-api-key', '' ) );
 	$dash_position = strpos( $api_key, '-' );
 
 	// setup the end point
-	if( $dash_position !== false ) {
+	if ( $dash_position !== false ) {
 		$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/subscribe.json';
 	}
 
@@ -136,8 +136,8 @@ 
 	*	Allow users to check for submit value
 	*	and pass back an error to the user
 	*/
-	if( isset( $merge_variables['error'] ) ) {
-		$process_submission_response = apply_filters( 'yikes-mailchimp-frontend-content' , $merge_variables['message'] );
+	if ( isset( $merge_variables[ 'error' ] ) ) {
+		$process_submission_response = apply_filters( 'yikes-mailchimp-frontend-content', $merge_variables[ 'message' ] );
 		return;
 	}
 
@@ -145,10 +145,10 @@ 
 	 * Setup whether or not we should update the user, or display the error with email generation
 	 * @since 6.1
 	 */
-	if ( isset( $form_settings['optin_settings']['update_existing_user'] ) && 1 === absint( $form_settings['optin_settings']['update_existing_user'] ) ) {
+	if ( isset( $form_settings[ 'optin_settings' ][ 'update_existing_user' ] ) && 1 === absint( $form_settings[ 'optin_settings' ][ 'update_existing_user' ] ) ) {
 		$update_existing_user = 1;
 		// Should we send the update email
-		if ( isset( $form_settings['optin_settings']['send_update_email'] ) && 1 === absint( $form_settings['optin_settings']['send_update_email'] ) ) {
+		if ( isset( $form_settings[ 'optin_settings' ][ 'send_update_email' ] ) && 1 === absint( $form_settings[ 'optin_settings' ][ 'send_update_email' ] ) ) {
 			$update_existing_user = 0;
 		}
 	} else {
@@ -160,14 +160,14 @@ 
 		$subscribe_response = wp_remote_post( $api_endpoint, array(
 			'body' => apply_filters( 'yikes-mailchimp-user-subscribe-api-request', array(
 				'apikey' => $api_key,
-				'id' => $_POST['yikes-mailchimp-associated-list-id'],
-				'email' => array( 'email' => sanitize_email( $_POST['EMAIL'] ) ),
+				'id' => $_POST[ 'yikes-mailchimp-associated-list-id' ],
+				'email' => array( 'email' => sanitize_email( $_POST[ 'EMAIL' ] ) ),
 				'merge_vars' => $merge_variables,
-				'double_optin' => $form_settings['optin_settings']['optin'],
+				'double_optin' => $form_settings[ 'optin_settings' ][ 'optin' ],
 				'update_existing' => $update_existing_user, // Decide if we should update the user or not
-				'send_welcome' => $form_settings['optin_settings']['send_welcome_email'],
-				'replace_interests' => ( isset( $form_settings['submission_settings']['replace_interests'] ) ) ? $form_settings['submission_settings']['replace_interests'] : 1, // defaults to replace
-			), $form_id, $_POST['yikes-mailchimp-associated-list-id'], $_POST['EMAIL'] ),
+				'send_welcome' => $form_settings[ 'optin_settings' ][ 'send_welcome_email' ],
+				'replace_interests' => ( isset( $form_settings[ 'submission_settings' ][ 'replace_interests' ] ) ) ? $form_settings[ 'submission_settings' ][ 'replace_interests' ] : 1, // defaults to replace
+			), $form_id, $_POST[ 'yikes-mailchimp-associated-list-id' ], $_POST[ 'EMAIL' ] ),
 			'timeout' => 10,
 			'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 		) );
@@ -175,67 +175,67 @@ 
 		$subscribe_response = json_decode( wp_remote_retrieve_body( $subscribe_response ), true );
 
 		// check for any errors
-		if( isset( $subscribe_response['error'] ) ) {
+		if ( isset( $subscribe_response[ 'error' ] ) ) {
 
-			if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+			if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 				require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-				$error_logging->yikes_easy_mailchimp_write_to_error_log( $subscribe_response['error'], __( "Subscribe New User" , 'yikes-inc-easy-mailchimp-extender' ), "process_form_submission.php" );
+				$error_logging->yikes_easy_mailchimp_write_to_error_log( $subscribe_response[ 'error' ], __( "Subscribe New User", 'yikes-inc-easy-mailchimp-extender' ), "process_form_submission.php" );
 			}
 
 			$update_account_details_link = '';
-			switch( $subscribe_response['code'] ) {
+			switch ( $subscribe_response[ 'code' ] ) {
 				// user already subscribed
 				case '214':
-					$custom_already_subscribed_text = apply_filters( 'yikes-easy-mailchimp-update-existing-subscriber-text', sprintf( __( ' To update your MailChimp profile, please %s.', 'yikes-inc-easy-mailchimp-extender' ), '<a class="send-update-email" data-list-id="' . $_POST['yikes-mailchimp-associated-list-id'] . '" data-user-email="' . sanitize_email( $_POST['EMAIL'] ) . '" href="#">' . __( 'click to send yourself an update link', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ), $form_id, '<a class="send-update-email" data-list-id="' . $_POST['yikes-mailchimp-associated-list-id'] . '" data-user-email="' . sanitize_email( $_POST['EMAIL'] ) . '" href="#">' . __( 'click to send yourself an update link', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );
-					$update_account_details_link = ( 1 === absint( $form_settings['optin_settings']['update_existing_user'] ) && 1 === absint( $form_settings['optin_settings']['send_update_email'] ) ) ? $custom_already_subscribed_text : false;
-					if( $update_account_details_link ) {
+					$custom_already_subscribed_text = apply_filters( 'yikes-easy-mailchimp-update-existing-subscriber-text', sprintf( __( ' To update your MailChimp profile, please %s.', 'yikes-inc-easy-mailchimp-extender' ), '<a class="send-update-email" data-list-id="' . $_POST[ 'yikes-mailchimp-associated-list-id' ] . '" data-user-email="' . sanitize_email( $_POST[ 'EMAIL' ] ) . '" href="#">' . __( 'click to send yourself an update link', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ), $form_id, '<a class="send-update-email" data-list-id="' . $_POST[ 'yikes-mailchimp-associated-list-id' ] . '" data-user-email="' . sanitize_email( $_POST[ 'EMAIL' ] ) . '" href="#">' . __( 'click to send yourself an update link', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );
+					$update_account_details_link = ( 1 === absint( $form_settings[ 'optin_settings' ][ 'update_existing_user' ] ) && 1 === absint( $form_settings[ 'optin_settings' ][ 'send_update_email' ] ) ) ? $custom_already_subscribed_text : false;
+					if ( $update_account_details_link ) {
 						// if update account details is set, we need to include our script to send out the update email
-						wp_enqueue_script( 'update-existing-subscriber.js', YIKES_MC_URL . 'public/js/yikes-update-existing-subscriber.js' , array( 'jquery' ), 'all' );
+						wp_enqueue_script( 'update-existing-subscriber.js', YIKES_MC_URL . 'public/js/yikes-update-existing-subscriber.js', array( 'jquery' ), 'all' );
 						wp_localize_script( 'update-existing-subscriber.js', 'update_subscriber_details_data', array(
 							'ajax_url' => esc_url( admin_url( 'admin-ajax.php' ) ),
 							'preloader_url' => apply_filters( 'yikes-mailchimp-preloader', esc_url_raw( admin_url( 'images/wpspin_light.gif' ) ) ),
 						) );
 					}
-					if( ! empty( $form_settings['error_messages']['already-subscribed'] ) ) {
-						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . $form_settings['error_messages']['already-subscribed'] . ' ' . $update_account_details_link . '</p>';
+					if ( ! empty( $form_settings[ 'error_messages' ][ 'already-subscribed' ] ) ) {
+						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . $form_settings[ 'error_messages' ][ 'already-subscribed' ] . ' ' . $update_account_details_link . '</p>';
 					} else {
-						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . $subscribe_response['error'] . ' ' . $update_account_details_link . '</p>';
+						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . $subscribe_response[ 'error' ] . ' ' . $update_account_details_link . '</p>';
 					}
 					break;
 				// missing a required field
 				case '250':
 						// get all merge variables in array, loop and str_replace error code with field name
-						$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
+						$api_key = trim( get_option( 'yikes-mc-api-key', '' ) );
 						$dash_position = strpos( $api_key, '-' );
-						if( $dash_position !== false ) {
+						if ( $dash_position !== false ) {
 							$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/merge-vars.json';
 						}
 						$merge_variables = wp_remote_post( $api_endpoint, array(
 							'body' => array(
 								'apikey' => $api_key,
-								'id' => array( $_POST['yikes-mailchimp-associated-list-id'] ) ,
+								'id' => array( $_POST[ 'yikes-mailchimp-associated-list-id' ] ),
 							),
 							'timeout' => 10,
 							'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true ),
 						) );
 						$merge_variables = json_decode( wp_remote_retrieve_body( $merge_variables ), true );
-						if( isset( $merge_variables['error'] ) ) {
-							if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+						if ( isset( $merge_variables[ 'error' ] ) ) {
+							if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 								require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 								$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-								$error_logging->yikes_easy_mailchimp_write_to_error_log( $merge_variables['error'], __( "Get Merge Variables" , 'yikes-inc-easy-mailchimp-extender' ), "process_form_submission.php" );
+								$error_logging->yikes_easy_mailchimp_write_to_error_log( $merge_variables[ 'error' ], __( "Get Merge Variables", 'yikes-inc-easy-mailchimp-extender' ), "process_form_submission.php" );
 							}
 						}
 						// re-store our data
-						$merge_variables = $merge_variables['data'][0]['merge_vars'];
+						$merge_variables = $merge_variables[ 'data' ][ 0 ][ 'merge_vars' ];
 						$merge_variable_name_array = array();
-						foreach( $merge_variables as $merge_var ) {
-							$merge_variables_name_array[$merge_var['tag']] = $merge_var['name'];
+						foreach ( $merge_variables as $merge_var ) {
+							$merge_variables_name_array[ $merge_var[ 'tag' ] ] = $merge_var[ 'name' ];
 						}
-						$error_message = $subscribe_response['error'];
+						$error_message = $subscribe_response[ 'error' ];
 						// replace tag with name in the error message.
-						foreach( $merge_variables_name_array as $tag => $name ) {
+						foreach ( $merge_variables_name_array as $tag => $name ) {
 							$error_message = str_replace( $tag, $name, $error_message );
 						}
 						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . $error_message . '.</p>';
@@ -243,18 +243,18 @@ 
 				// test@email.com is not allowed
 				case '-99':
 					// generic error
-					$process_submission_response = '<p class="yikes-easy-mc-error-message">' .  str_replace( ' and cannot be imported', '', str_replace( 'List_RoleEmailMember:', '', $subscribe_response['error'] ) ) . '</p>';
+					$process_submission_response = '<p class="yikes-easy-mc-error-message">' . str_replace( ' and cannot be imported', '', str_replace( 'List_RoleEmailMember:', '', $subscribe_response[ 'error' ] ) ) . '</p>';
 					break;
 				// invalid email (or no email at all)
 				case '-100':
-					$process_submission_response = ( ! empty( $form_settings['error_messages']['invalid-email'] ) ) ? '<p class="yikes-easy-mc-error-message">' . $form_settings['error_messages']['invalid-email'] . '</p>' : '<p class="yikes-easy-mc-error-message">' . __( 'Please provide a valid email address.', 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
+					$process_submission_response = ( ! empty( $form_settings[ 'error_messages' ][ 'invalid-email' ] ) ) ? '<p class="yikes-easy-mc-error-message">' . $form_settings[ 'error_messages' ][ 'invalid-email' ] . '</p>' : '<p class="yikes-easy-mc-error-message">' . __( 'Please provide a valid email address.', 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
 					break;
 				default:
 					// generic error
-					if( ! empty( $form_settings['error_messages']['general-error'] ) ) {
-						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . $form_settings['error_messages']['general-error'] . '</p>';
+					if ( ! empty( $form_settings[ 'error_messages' ][ 'general-error' ] ) ) {
+						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . $form_settings[ 'error_messages' ][ 'general-error' ] . '</p>';
 					} else {
-						$process_submission_response = '<p class="yikes-easy-mc-error-message">' .  $subscribe_response['error'] . '</p>';
+						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . $subscribe_response[ 'error' ] . '</p>';
 					}
 					break;
 			}
@@ -265,11 +265,11 @@ 
 		$form_submitted = 1;
 
 		// Display the success message
-		if( ! empty( $form_settings['error_messages']['success'] ) ) {
-			$process_submission_response = '<p class="yikes-easy-mc-success-message">' . apply_filters( 'yikes-mailchimp-success-response', stripslashes( esc_html( $form_settings['error_messages']['success'] ) ), $form_id, $merge_variables ) . '</p>';
+		if ( ! empty( $form_settings[ 'error_messages' ][ 'success' ] ) ) {
+			$process_submission_response = '<p class="yikes-easy-mc-success-message">' . apply_filters( 'yikes-mailchimp-success-response', stripslashes( esc_html( $form_settings[ 'error_messages' ][ 'success' ] ) ), $form_id, $merge_variables ) . '</p>';
 			// echo stripslashes( esc_html( $error_messages['success'] ) );
 		} else {
-			$default_success_response = ( 1 === $form_settings['optin_settings']['optin'] ) ? __( 'Thank you for subscribing! Check your email for the confirmation message.' , 'yikes-inc-easy-mailchimp-extender' ) : __( 'Thank you for subscribing!' , 'yikes-inc-easy-mailchimp-extender' );
+			$default_success_response = ( 1 === $form_settings[ 'optin_settings' ][ 'optin' ] ) ? __( 'Thank you for subscribing! Check your email for the confirmation message.', 'yikes-inc-easy-mailchimp-extender' ) : __( 'Thank you for subscribing!', 'yikes-inc-easy-mailchimp-extender' );
 			$process_submission_response = '<p class="yikes-easy-mc-success-message">' . apply_filters( 'yikes-mailchimp-success-response', $default_success_response, $form_id, $merge_variables ) . '</p>';
 			// echo $default_success_response;
 		}
@@ -282,8 +282,8 @@ 
 		* 	optional @form - the ID of the form to filter
 		*	@since 6.0.0
 		*/
-		do_action( 'yikes-mailchimp-after-submission' , $merge_variables );
-		do_action( 'yikes-mailchimp-after-submission-' . $form_id , $merge_variables );
+		do_action( 'yikes-mailchimp-after-submission', $merge_variables );
+		do_action( 'yikes-mailchimp-after-submission-' . $form_id, $merge_variables );
 
 		/*
 		*	Non-AJAX redirects now handled in class-yikes-inc-easy-mailchimp-extender-public.php
@@ -301,23 +301,23 @@ 
 		*	@$notifications - the notification array
 		*	@since 6.0.0
 		*/
-		do_action( 'yikes-mailchimp-form-submission' , $_POST['EMAIL'] , $merge_variables , $form_id , $form_settings['notifications'] );
-		do_action( 'yikes-mailchimp-form-submission-' . $form_id , $_POST['EMAIL'] , $merge_variables , $form_id , $form_settings['notifications'] );
+		do_action( 'yikes-mailchimp-form-submission', $_POST[ 'EMAIL' ], $merge_variables, $form_id, $form_settings[ 'notifications' ] );
+		do_action( 'yikes-mailchimp-form-submission-' . $form_id, $_POST[ 'EMAIL' ], $merge_variables, $form_id, $form_settings[ 'notifications' ] );
 
 		/*
 		*	Increase the submission count for this form
 		*	on a successful submission
 		*	@since 6.0.0
 		*/
-		$form_settings['submissions']++;
+		$form_settings[ 'submissions' ]++;
 		$wpdb->update(
 			$wpdb->prefix . 'yikes_easy_mc_forms',
 			array(
-				'submissions' => $form_settings['submissions'],
+				'submissions' => $form_settings[ 'submissions' ],
 			),
 			array( 'ID' => $form_id ),
 			array(
-				'%d',	// send welcome email
+				'%d', // send welcome email
 			),
 			array( '%d' )
 		);

public/partials/shortcodes/process/process_form_submission_ajax.php

Spacing +72 added lines, -72 removed lines

@@ -5,34 +5,34 @@ 
 */
 
 // parse our form data
-parse_str( $_POST['form_data'], $data );
+parse_str( $_POST[ 'form_data' ], $data );
 // store the form ID to use in our hooks and filters
-$form = $_POST['form_id'];
+$form = $_POST[ 'form_id' ];
 
 // Retreive the form data from the database instead of posting it with the form-submission
 global $wpdb;
 // return it as an array, so we can work with it to build our form below
 $form_results = $wpdb->get_results( 'SELECT * FROM ' . $wpdb->prefix . 'yikes_easy_mc_forms WHERE id = ' . $form . '', ARRAY_A );
 
-if( $form_results ) {
-	$form_data = $form_results[0];
+if ( $form_results ) {
+	$form_data = $form_results[ 0 ];
 	// List ID
-	$list_id = $form_data['list_id'];
+	$list_id = $form_data[ 'list_id' ];
 	// decode our submission settings
-	$submission_settings = json_decode( stripslashes( $form_data['submission_settings'] ), true );
+	$submission_settings = json_decode( stripslashes( $form_data[ 'submission_settings' ] ), true );
 	// decode our optin settings
-	$optin_settings = json_decode( stripslashes( $form_data['optin_settings'] ), true );
+	$optin_settings = json_decode( stripslashes( $form_data[ 'optin_settings' ] ), true );
 	// decode our fields
-	$form_fields = json_decode( stripslashes( $form_data['fields'] ), true );
+	$form_fields = json_decode( stripslashes( $form_data[ 'fields' ] ), true );
 	/*	Decode our error messages
 	*	Workaround for international characters (cyrillic etc)
 	* 	See: https://wordpress.org/support/topic/custom-messages-do-not-support-cyrillic-characters?replies=11#post-7629620
 	*/
-	$error_messages = ( get_magic_quotes_gpc() ) ? json_decode( stripslashes( $form_data['error_messages'] ), true ) : json_decode( $form_data['error_messages'], true );
+	$error_messages = ( get_magic_quotes_gpc() ) ? json_decode( stripslashes( $form_data[ 'error_messages' ] ), true ) : json_decode( $form_data[ 'error_messages' ], true );
 	/** Submit Process **/
-	$notifications = json_decode( stripslashes( $form_data['custom_notifications'] ), true );
+	$notifications = json_decode( stripslashes( $form_data[ 'custom_notifications' ] ), true );
 	/* Page Data */
-	$page_data = $_POST['page_data'];
+	$page_data = $_POST[ 'page_data' ];
 }
 
 // Empty array to build up merge variables
@@ -42,39 +42,39 @@ 
 $error = 0;
 
 /* Check for Honeypot filled */
-$honey_pot_filled = ( isset( $data['yikes-mailchimp-honeypot'] ) && $data['yikes-mailchimp-honeypot'] != '' ) ? true : false;
+$honey_pot_filled = ( isset( $data[ 'yikes-mailchimp-honeypot' ] ) && $data[ 'yikes-mailchimp-honeypot' ] != '' ) ? true : false;
 // if it was filled out, return an error...
-if( $honey_pot_filled ) {
+if ( $honey_pot_filled ) {
 	wp_send_json_error( array(
 		'hide' => '0',
 		'error' => 1,
-		'response' => __( "Error: It looks like the honeypot was filled out and the form was not properly be submitted." , 'yikes-inc-easy-mailchimp-extender' )
+		'response' => __( "Error: It looks like the honeypot was filled out and the form was not properly be submitted.", 'yikes-inc-easy-mailchimp-extender' )
 	) );
 	return;
 }
 
 // Check reCAPTCHA Response was submitted with the form data
-if( isset( $data['g-recaptcha-response'] ) ) {
-	$url = esc_url_raw( 'https://www.google.com/recaptcha/api/siteverify?secret=' . get_option( 'yikes-mc-recaptcha-secret-key' , '' ) . '&response=' . $data['g-recaptcha-response'] . '&remoteip=' . $_SERVER["REMOTE_ADDR"] );
+if ( isset( $data[ 'g-recaptcha-response' ] ) ) {
+	$url = esc_url_raw( 'https://www.google.com/recaptcha/api/siteverify?secret=' . get_option( 'yikes-mc-recaptcha-secret-key', '' ) . '&response=' . $data[ 'g-recaptcha-response' ] . '&remoteip=' . $_SERVER[ "REMOTE_ADDR" ] );
 	$response = wp_remote_get( $url );
-	$response_body = json_decode( $response['body'] , true );
+	$response_body = json_decode( $response[ 'body' ], true );
 	// if we've hit an error, lets return the error!
-	if( $response_body['success'] != 1 ) {
+	if ( $response_body[ 'success' ] != 1 ) {
 		$error_messages = array(); // empty array to store error messages
-		if( isset( $response_body['error-codes'] ) ) {
-			foreach( $response_body['error-codes'] as $error_code ) {
-				if( $error_code == 'missing-input-response' ) {
+		if ( isset( $response_body[ 'error-codes' ] ) ) {
+			foreach ( $response_body[ 'error-codes' ] as $error_code ) {
+				if ( $error_code == 'missing-input-response' ) {
 					$error_code = __( 'Please check the reCAPTCHA field.', 'yikes-inc-easy-mailchimp-extender' );
 				}
-				$error_messages[] = __( 'Error', 'yikes-inc-easy-mailchimp-extender' ) . ': ' . $error_code;
+				$error_messages[ ] = __( 'Error', 'yikes-inc-easy-mailchimp-extender' ) . ': ' . $error_code;
 			}
 		} else {
-			$error_messages[] = __( 'Please refresh the page and try again.', 'yikes-inc-easy-mailchimp-extender' );
+			$error_messages[ ] = __( 'Please refresh the page and try again.', 'yikes-inc-easy-mailchimp-extender' );
 		}
 		$error = 1;
 		wp_send_json_error( array(
 			'hide' => '0',
-			'error' => $error ,
+			'error' => $error,
 			'response' => apply_filters( 'yikes-mailchimp-recaptcha-required-error', implode( ' ', $error_messages ) ),
 		) );
 		exit();
@@ -83,12 +83,12 @@ 
 
 // loop to push variables to our array
 foreach ( $data as $merge_tag => $value ) {
-	if( $merge_tag != 'yikes_easy_mc_new_subscriber' && $merge_tag != '_wp_http_referer' ) {
+	if ( $merge_tag != 'yikes_easy_mc_new_subscriber' && $merge_tag != '_wp_http_referer' ) {
 		// check if the current iteration has a 'date_format' key set
 		// (aka - date/birthday fields)
-		if( isset( $form_fields[$merge_tag]['date_format'] ) ) {
+		if ( isset( $form_fields[ $merge_tag ][ 'date_format' ] ) ) {
 			// check if EU date format
-			if( $form_fields[$merge_tag]['date_format'] == 'DD/MM/YYYY' ) {
+			if ( $form_fields[ $merge_tag ][ 'date_format' ] == 'DD/MM/YYYY' ) {
 				// convert '/' to '.' and to UNIX timestamp
 				$value = date( 'Y-m-d', strtotime( str_replace( '/', '.', $value ) ) );
 			} else {
@@ -96,22 +96,22 @@ 
 				$value = date( 'Y-m-d', strtotime( $value ) );
 			}
 		}
-		if( is_numeric( $merge_tag ) ) { // this is is an interest group!
-			$merge_variables['groupings'][] = array( 'id' => $merge_tag , 'groups' => ( is_array( $value ) ) ? $value : array( $value ) );
+		if ( is_numeric( $merge_tag ) ) { // this is is an interest group!
+			$merge_variables[ 'groupings' ][ ] = array( 'id' => $merge_tag, 'groups' => ( is_array( $value ) ) ? $value : array( $value ) );
 		} else { // or else it's just a standard merge variable
-			$merge_variables[$merge_tag] = $value;
+			$merge_variables[ $merge_tag ] = $value;
 		}
 	}
 }
 // store the opt-in time
-$merge_variables['optin_time'] = current_time( 'Y-m-d H:i:s', 1 );
+$merge_variables[ 'optin_time' ] = current_time( 'Y-m-d H:i:s', 1 );
 
 // Submit our form data
-$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
+$api_key = trim( get_option( 'yikes-mc-api-key', '' ) );
 $dash_position = strpos( $api_key, '-' );
 
 // setup the end point
-if( $dash_position !== false ) {
+if ( $dash_position !== false ) {
 	$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/subscribe.json';
 }
 
@@ -137,9 +137,9 @@ 
 *	Allow users to check for submit value
 *	and pass back an error to the user
 */
-if( isset( $merge_variables['error'] ) ) {
+if ( isset( $merge_variables[ 'error' ] ) ) {
 	// send our error response back
-	wp_send_json_error( array( 'hide' => '0', 'error' => $merge_variables['error']  , 'response' => $merge_variables['message']  ) );
+	wp_send_json_error( array( 'hide' => '0', 'error' => $merge_variables[ 'error' ], 'response' => $merge_variables[ 'message' ] ) );
 	return;
 }
 
@@ -147,9 +147,9 @@ 
  * Setup whether or not we should update the user, or display the error with email generation
  * @since 6.1
  */
-if ( isset( $optin_settings['update_existing_user'] ) && 1 === absint( $optin_settings['update_existing_user'] ) ) {
+if ( isset( $optin_settings[ 'update_existing_user' ] ) && 1 === absint( $optin_settings[ 'update_existing_user' ] ) ) {
 	// Should we send the update email
-	if ( isset( $optin_settings['send_update_email'] ) && 1 === absint( $optin_settings['send_update_email'] ) ) {
+	if ( isset( $optin_settings[ 'send_update_email' ] ) && 1 === absint( $optin_settings[ 'send_update_email' ] ) ) {
 		$update_existing_user = 0;
 	} else {
 		$update_existing_user = 1;
@@ -164,73 +164,73 @@ 
 		'body' => apply_filters( 'yikes-mailchimp-user-subscribe-api-request', array(
 			'apikey' => $api_key,
 			'id' => $list_id,
-			'email' => array( 'email' => sanitize_email( $data['EMAIL'] ) ),
+			'email' => array( 'email' => sanitize_email( $data[ 'EMAIL' ] ) ),
 			'merge_vars' => $merge_variables,
-			'double_optin' => $optin_settings['optin'],
+			'double_optin' => $optin_settings[ 'optin' ],
 			'update_existing' => $update_existing_user, // Decide if we should update the user or not
-			'send_welcome' => $optin_settings['send_welcome_email'],
-			'replace_interests' => ( isset( $submission_settings['replace_interests'] ) ) ? $submission_settings['replace_interests'] : 1, // defaults to replace
-		), $form, $list_id, $data['EMAIL'] ),
+			'send_welcome' => $optin_settings[ 'send_welcome_email' ],
+			'replace_interests' => ( isset( $submission_settings[ 'replace_interests' ] ) ) ? $submission_settings[ 'replace_interests' ] : 1, // defaults to replace
+		), $form, $list_id, $data[ 'EMAIL' ] ),
 		'timeout' => 10,
 		'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 	) );
 
 	$subscribe_response = json_decode( wp_remote_retrieve_body( $subscribe_response ), true );
 
-	if( isset( $subscribe_response['error'] ) ) {
+	if ( isset( $subscribe_response[ 'error' ] ) ) {
 
-		if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+		if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 			require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-			$error_logging->yikes_easy_mailchimp_write_to_error_log( $subscribe_response['error'], __( "Subscribe New User" , 'yikes-inc-easy-mailchimp-extender' ), "process_form_submission_ajax.php" );
+			$error_logging->yikes_easy_mailchimp_write_to_error_log( $subscribe_response[ 'error' ], __( "Subscribe New User", 'yikes-inc-easy-mailchimp-extender' ), "process_form_submission_ajax.php" );
 		}
 
 		$update_account_details_link = '';
 		$error = 1;
-		switch( $subscribe_response['code'] ) {
+		switch ( $subscribe_response[ 'code' ] ) {
 			// user already subscribed
 			case '214':
-				$custom_already_subscribed_text = apply_filters( 'yikes-easy-mailchimp-update-existing-subscriber-text', sprintf( __( ' To update your MailChimp profile, please %s.', 'yikes-inc-easy-mailchimp-extender' ), '<a class="send-update-email" data-list-id="' . $list_id . '" data-user-email="' . sanitize_email( $data['EMAIL'] ) . '" href="#">' . __( 'click to send yourself an update link', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ), $form, '<a class="send-update-email" data-list-id="' . $_POST['yikes-mailchimp-associated-list-id'] . '" data-user-email="' . sanitize_email( $_POST['EMAIL'] ) . '" href="#">' . __( 'click to send yourself an update link', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );
-				$update_account_details_link = ( 1 === absint( $optin_settings['update_existing_user'] ) && 1 === absint( $optin_settings['send_update_email'] ) ) ? $custom_already_subscribed_text : false;
-				if( ! empty( $error_messages['already-subscribed'] ) ) {
-					$error_response = $error_messages['already-subscribed'] . ' ' . $update_account_details_link;
+				$custom_already_subscribed_text = apply_filters( 'yikes-easy-mailchimp-update-existing-subscriber-text', sprintf( __( ' To update your MailChimp profile, please %s.', 'yikes-inc-easy-mailchimp-extender' ), '<a class="send-update-email" data-list-id="' . $list_id . '" data-user-email="' . sanitize_email( $data[ 'EMAIL' ] ) . '" href="#">' . __( 'click to send yourself an update link', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ), $form, '<a class="send-update-email" data-list-id="' . $_POST[ 'yikes-mailchimp-associated-list-id' ] . '" data-user-email="' . sanitize_email( $_POST[ 'EMAIL' ] ) . '" href="#">' . __( 'click to send yourself an update link', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );
+				$update_account_details_link = ( 1 === absint( $optin_settings[ 'update_existing_user' ] ) && 1 === absint( $optin_settings[ 'send_update_email' ] ) ) ? $custom_already_subscribed_text : false;
+				if ( ! empty( $error_messages[ 'already-subscribed' ] ) ) {
+					$error_response = $error_messages[ 'already-subscribed' ] . ' ' . $update_account_details_link;
 				} else {
-					$error_response = $subscribe_response['error'] . ' ' . $update_account_details_link;
+					$error_response = $subscribe_response[ 'error' ] . ' ' . $update_account_details_link;
 				}
 				break;
 			// missing a required field
 			case '250':
 					// get all merge variables in array, loop and str_replace error code with field name
-					$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
+					$api_key = trim( get_option( 'yikes-mc-api-key', '' ) );
 					$dash_position = strpos( $api_key, '-' );
-					if( $dash_position !== false ) {
+					if ( $dash_position !== false ) {
 						$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/merge-vars.json';
 					}
 					$merge_variables = wp_remote_post( $api_endpoint, array(
 						'body' => array(
 							'apikey' => $api_key,
-							'id' => array( $list_id ) ,
+							'id' => array( $list_id ),
 						),
 						'timeout' => 10,
 						'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true ),
 					) );
 					$merge_variables = json_decode( wp_remote_retrieve_body( $merge_variables ), true );
-					if( is_wp_error( $merge_variables ) || isset( $merge_variables['error'] ) ) {
-						if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+					if ( is_wp_error( $merge_variables ) || isset( $merge_variables[ 'error' ] ) ) {
+						if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 							require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 							$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-							$error_logging->yikes_easy_mailchimp_write_to_error_log( $merge_variables['error'], __( "Get Merge Variables" , 'yikes-inc-easy-mailchimp-extender' ), "process_form_submission_ajax.php" );
+							$error_logging->yikes_easy_mailchimp_write_to_error_log( $merge_variables[ 'error' ], __( "Get Merge Variables", 'yikes-inc-easy-mailchimp-extender' ), "process_form_submission_ajax.php" );
 						}
 					}
 					// re-store our data
-					$merge_variables = $merge_variables['data'][0]['merge_vars'];
+					$merge_variables = $merge_variables[ 'data' ][ 0 ][ 'merge_vars' ];
 					$merge_variable_name_array = array();
-					foreach( $merge_variables as $merge_var ) {
-						$merge_variables_name_array[$merge_var['tag']] = $merge_var['name'];
+					foreach ( $merge_variables as $merge_var ) {
+						$merge_variables_name_array[ $merge_var[ 'tag' ] ] = $merge_var[ 'name' ];
 					}
-					$error_message = $subscribe_response['error'];
+					$error_message = $subscribe_response[ 'error' ];
 					// replace tag with name in the error message.
-					foreach( $merge_variables_name_array as $tag => $name ) {
+					foreach ( $merge_variables_name_array as $tag => $name ) {
 						$error_message = str_replace( $tag, $name, $error_message );
 					}
 					$error_response = $error_message;
@@ -238,14 +238,14 @@ 
 			// test@email.com is not allowed
 			case '-99':
 				// generic error
-				$error_response = str_replace( ' and cannot be imported', '', str_replace( 'List_RoleEmailMember:', '', $subscribe_response['error'] ) );
+				$error_response = str_replace( ' and cannot be imported', '', str_replace( 'List_RoleEmailMember:', '', $subscribe_response[ 'error' ] ) );
 				break;
 			// invalid email (or no email at all)
 				case '-100':
-					$error_response = ( ! empty( $error_messages['invalid-email'] ) ) ? $error_messages['invalid-email'] : __( 'Please provide a valid email address.', 'yikes-inc-easy-mailchimp-extender' );
+					$error_response = ( ! empty( $error_messages[ 'invalid-email' ] ) ) ? $error_messages[ 'invalid-email' ] : __( 'Please provide a valid email address.', 'yikes-inc-easy-mailchimp-extender' );
 					break;
 			default:
-				$error_response = ( ! empty( $error_messages['general-error'] ) ) ? $error_messages['general-error'] : $subscribe_response['error'];
+				$error_response = ( ! empty( $error_messages[ 'general-error' ] ) ) ? $error_messages[ 'general-error' ] : $subscribe_response[ 'error' ];
 				break;
 		}
 		// send the response
@@ -263,9 +263,9 @@ 
 	/*
 	*	Successful form submission redirect
 	*/
-	if( $submission_settings['redirect_on_submission'] == '1' ) {
+	if ( $submission_settings[ 'redirect_on_submission' ] == '1' ) {
 		$redirection = '1';
-		$redirect_url = ( 'custom_url' != $submission_settings['redirect_page'] ) ? get_permalink( $submission_settings['redirect_page'] ) : $submission_settings['custom_redirect_url'];
+		$redirect_url = ( 'custom_url' != $submission_settings[ 'redirect_page' ] ) ? get_permalink( $submission_settings[ 'redirect_page' ] ) : $submission_settings[ 'custom_redirect_url' ];
 		$redirect = '<script type="text/javascript">setTimeout(function() { window.location="' . apply_filters( 'yikes-mailchimp-redirect-url', esc_url( $redirect_url ), $form, $page_data ) . '"; }, ' . apply_filters( 'yikes-mailchimp-redirect-timer', 1500 ) . ');</script>';
 	}
 
@@ -281,16 +281,16 @@ 
 	do_action( 'yikes-mailchimp-after-submission-' . $form, $merge_variables );
 
 	// send our notifications if setup (must go before wp_send_json())
-	do_action( 'yikes-mailchimp-form-submission' , sanitize_email( $data['EMAIL'] ), $merge_variables , $form , $notifications );
-	do_action( 'yikes-mailchimp-form-submission-' . $form, sanitize_email( $data['EMAIL'] ), $merge_variables , $form , $notifications );
+	do_action( 'yikes-mailchimp-form-submission', sanitize_email( $data[ 'EMAIL' ] ), $merge_variables, $form, $notifications );
+	do_action( 'yikes-mailchimp-form-submission-' . $form, sanitize_email( $data[ 'EMAIL' ] ), $merge_variables, $form, $notifications );
 
-	$default_success_response = ( 1 === $optin_settings['optin'] ) ? __( "Thank you for subscribing! Check your email for the confirmation message." , 'yikes-inc-easy-mailchimp-extender' ) : __( "Thank you for subscribing!" , 'yikes-inc-easy-mailchimp-extender' );
+	$default_success_response = ( 1 === $optin_settings[ 'optin' ] ) ? __( "Thank you for subscribing! Check your email for the confirmation message.", 'yikes-inc-easy-mailchimp-extender' ) : __( "Thank you for subscribing!", 'yikes-inc-easy-mailchimp-extender' );
 
 	wp_send_json_success(
 		array(
-			'hide' => $submission_settings['hide_form_post_signup'],
+			'hide' => $submission_settings[ 'hide_form_post_signup' ],
 			'error' => $error,
-			'response' => apply_filters( 'yikes-mailchimp-success-response', ( ! empty( $error_messages['success'] ) ? $error_messages['success'] : $default_success_response ), $form, $merge_variables ),
+			'response' => apply_filters( 'yikes-mailchimp-success-response', ( ! empty( $error_messages[ 'success' ] ) ? $error_messages[ 'success' ] : $default_success_response ), $form, $merge_variables ),
 			'redirection' => isset( $redirection ) ? '1' : '0',
 			'redirect' => isset( $redirect ) ? $redirect : '',
 		)

admin/partials/edit-form.php

Spacing +210 added lines, -210 removed lines

@@ -2,45 +2,45 @@ 
 	<?php
 
 		// if an error was returned in the most recent query
-		if( isset( $_GET['sql_error'] ) ) {
+		if ( isset( $_GET[ 'sql_error' ] ) ) {
 			// if error logging is turned on, lets display a better error to help narrow things down
 			// lets also log things to the error log
-			if( get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
-				wp_die( '<strong>' . __( 'Error Creating Form' , 'yikes-inc-easy-mailchimp-extender' ) . '</strong> <p>' . stripslashes( urldecode( $_GET['sql_error'] ) ) . '</p>' , __( 'Error Creating Form' , 'yikes-inc-easy-mailchimp-extender' ) );
+			if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
+				wp_die( '<strong>' . __( 'Error Creating Form', 'yikes-inc-easy-mailchimp-extender' ) . '</strong> <p>' . stripslashes( urldecode( $_GET[ 'sql_error' ] ) ) . '</p>', __( 'Error Creating Form', 'yikes-inc-easy-mailchimp-extender' ) );
 			} else {
-				wp_die( '<strong>' . __( 'Error Creating Form' , 'yikes-inc-easy-mailchimp-extender' ) . '</strong><p>' . __( "Please try again. If the error persists please get in contact with the YIKES Inc. support team." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>' );
+				wp_die( '<strong>' . __( 'Error Creating Form', 'yikes-inc-easy-mailchimp-extender' ) . '</strong><p>' . __( "Please try again. If the error persists please get in contact with the YIKES Inc. support team.", 'yikes-inc-easy-mailchimp-extender' ) . '</p>' );
 			}
 		}
 
 		/* Get The Form ID we need to edit */
-		if( isset( $_GET['id'] ) ) {
+		if ( isset( $_GET[ 'id' ] ) ) {
 			global $wpdb;
 			// grab and store the form ID
-			$form_id = (int) $_GET['id'];
+			$form_id = (int) $_GET[ 'id' ];
 			// return it as an array, so we can work with it to build our form below
 			$form_results = $wpdb->get_results( 'SELECT * FROM ' . $wpdb->prefix . 'yikes_easy_mc_forms WHERE id = ' . $form_id . '', ARRAY_A );
 			// Get all results for our form switcher
 			$all_forms = $wpdb->get_results( 'SELECT * FROM ' . $wpdb->prefix . 'yikes_easy_mc_forms', ARRAY_A );
 
 			// if the form was not found return an error
-			if( !$form_results ) {
-				wp_die( printf( __( "Whoops! It looks like this form doesn't exist. If this error persists you may want to toggle on debugging on the <a href='%s'>%s</a> " , 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings' ) ), __( 'debug settings page' , 'yikes-inc-easy-mailchimp-extender' ) ), __( 'Error' , 'yikes-inc-easy-mailchimp-extender' ) );
+			if ( ! $form_results ) {
+				wp_die( printf( __( "Whoops! It looks like this form doesn't exist. If this error persists you may want to toggle on debugging on the <a href='%s'>%s</a> ", 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings' ) ), __( 'debug settings page', 'yikes-inc-easy-mailchimp-extender' ) ), __( 'Error', 'yikes-inc-easy-mailchimp-extender' ) );
 			}
 
 			// store our results
-			$form = $form_results[0];
+			$form = $form_results[ 0 ];
 			// set global form data, mainly for use in custom form field declarations
-			$GLOBALS["form_data"] = $form;
+			$GLOBALS[ "form_data" ] = $form;
 
-			$custom_styles = json_decode( $form['custom_styles'] , true );
-			$optin_settings = json_decode( $form['optin_settings'] , true );
-			$submission_settings = json_decode( $form['submission_settings'] , true );
-			$error_messages = json_decode( $form['error_messages'] , true );
-			$form_settings = ( isset( $form['form_settings'] ) ) ? json_decode( $form['form_settings'] , true ) : false;
-			$custom_notifications = json_decode( $form['custom_notifications'] , true );
+			$custom_styles = json_decode( $form[ 'custom_styles' ], true );
+			$optin_settings = json_decode( $form[ 'optin_settings' ], true );
+			$submission_settings = json_decode( $form[ 'submission_settings' ], true );
+			$error_messages = json_decode( $form[ 'error_messages' ], true );
+			$form_settings = ( isset( $form[ 'form_settings' ] ) ) ? json_decode( $form[ 'form_settings' ], true ) : false;
+			$custom_notifications = json_decode( $form[ 'custom_notifications' ], true );
 
 			// get defaults if none are saved in the database yet
-			if( ! isset( $form_settings ) || empty( $form_settings ) ) {
+			if ( ! isset( $form_settings ) || empty( $form_settings ) ) {
 				// setup defaults if none are saved
 				$form_settings = array(
 					'yikes-easy-mc-form-class-names' => '',
@@ -52,19 +52,19 @@ 
 					'yikes-easy-mc-form-schedule' => '0',
 					'yikes-easy-mc-form-restriction-start' => strtotime( current_time( 'm/d/Y g:iA' ) ), // current date & time
 					'yikes-easy-mc-form-restriction-end' => strtotime( current_time( 'm/d/Y g:iA' ) ) + ( 3600 * 24 ), // current date & time + 1 day
-					'yikes-easy-mc-form-restriction-pending-message' => sprintf( __( 'Signup is not yet open, and will be available on %s. Please come back then to signup.', 'yikes-inc-easy-mailchimp-extender' ), current_time( str_replace( '-', '/', get_option( 'date_format' ) ) ) . ' ' . __( 'at', 'yikes-inc-easy-mailchimp-extender' ) . ' ' . current_time( 'g:iA' ) ) ,
-					'yikes-easy-mc-form-restriction-expired-message' => sprintf( __( 'This signup for this form ended on %s.', 'yikes-inc-easy-mailchimp-extender' ), date( str_replace( '-', '/', get_option( 'date_format' ) ), strtotime( current_time( str_replace( '-', '/', get_option( 'date_format' ) ) ) ) + ( 3600 * 24 ) ) . ' ' . __( 'at', 'yikes-inc-easy-mailchimp-extender' ) . ' ' . date( 'g:iA', strtotime( current_time( 'g:iA' ) ) + ( 3600 * 24 ) ) ) ,
+					'yikes-easy-mc-form-restriction-pending-message' => sprintf( __( 'Signup is not yet open, and will be available on %s. Please come back then to signup.', 'yikes-inc-easy-mailchimp-extender' ), current_time( str_replace( '-', '/', get_option( 'date_format' ) ) ) . ' ' . __( 'at', 'yikes-inc-easy-mailchimp-extender' ) . ' ' . current_time( 'g:iA' ) ),
+					'yikes-easy-mc-form-restriction-expired-message' => sprintf( __( 'This signup for this form ended on %s.', 'yikes-inc-easy-mailchimp-extender' ), date( str_replace( '-', '/', get_option( 'date_format' ) ), strtotime( current_time( str_replace( '-', '/', get_option( 'date_format' ) ) ) ) + ( 3600 * 24 ) ) . ' ' . __( 'at', 'yikes-inc-easy-mailchimp-extender' ) . ' ' . date( 'g:iA', strtotime( current_time( 'g:iA' ) ) + ( 3600 * 24 ) ) ),
 					'yikes-easy-mc-form-login-required' => '0',
 					'yikes-easy-mc-form-restriction-login-message' => __( 'You need to be logged in to sign up for this mailing list.', 'yikes-inc-easy-mailchimp-extender' ),
 				);
 			}
 
-			$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
+			$api_key = trim( get_option( 'yikes-mc-api-key', '' ) );
 			$dash_position = strpos( $api_key, '-' );
 
 			// Check for a transient, if not - set one up for one hour
 			if ( false === ( $list_data = get_transient( 'yikes-easy-mailchimp-list-data' ) ) ) {
-				if( $dash_position !== false ) {
+				if ( $dash_position !== false ) {
 					$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/list.json';
 				}
 				$list_data = wp_remote_post( $api_endpoint, array(
@@ -76,11 +76,11 @@ 
 					'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 				) );
 				$list_data = json_decode( wp_remote_retrieve_body( $list_data ), true );
-				if( isset( $list_data['error'] ) ) {
-					if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+				if ( isset( $list_data[ 'error' ] ) ) {
+					if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 						require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 						$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-						$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data['error'], __( "Get Account Lists" , 'yikes-inc-easy-mailchimp-extender' ), "Edit Form Page" );
+						$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data[ 'error' ], __( "Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ), "Edit Form Page" );
 					}
 				} else {
 					// set our transient
@@ -89,57 +89,57 @@ 
 			}
 
 			// get the list data
-			if( $dash_position !== false ) {
+			if ( $dash_position !== false ) {
 				$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/merge-vars.json';
 			}
 			$available_merge_variables = wp_remote_post( $api_endpoint, array(
 				'body' => array(
 					'apikey' => $api_key,
-					'id' => array( $form['list_id'] ),
+					'id' => array( $form[ 'list_id' ] ),
 				),
 				'timeout' => 10,
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
 			$available_merge_variables = json_decode( wp_remote_retrieve_body( $available_merge_variables ), true );
-			if( isset( $available_merge_variables['error'] ) ) {
-				if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+			if ( isset( $available_merge_variables[ 'error' ] ) ) {
+				if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 					require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 					$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-					$error_logging->yikes_easy_mailchimp_write_to_error_log( $available_merge_variables['error'], __( "Get Merge Variables" , 'yikes-inc-easy-mailchimp-extender' ), "Edit Form Page" );
+					$error_logging->yikes_easy_mailchimp_write_to_error_log( $available_merge_variables[ 'error' ], __( "Get Merge Variables", 'yikes-inc-easy-mailchimp-extender' ), "Edit Form Page" );
 				}
 			}
 
 			// get the interest group data
-			if( $dash_position !== false ) {
+			if ( $dash_position !== false ) {
 				$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/interest-groupings.json';
 			}
 			$interest_groupings = wp_remote_post( $api_endpoint, array(
 				'body' => array(
 					'apikey' => $api_key,
-					'id' => $form['list_id']
+					'id' => $form[ 'list_id' ]
 				),
 				'timeout' => 10,
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
 			$interest_groupings = json_decode( wp_remote_retrieve_body( $interest_groupings ), true );
-			$no_interest_groupings = '<p class="description error-descripion">' . __( 'No Interest Groups Found' , 'yikes-inc-easy-mailchimp-extender' ) . '.</p>';
-			if( isset( $interest_groupings['error'] ) ) {
-				if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+			$no_interest_groupings = '<p class="description error-descripion">' . __( 'No Interest Groups Found', 'yikes-inc-easy-mailchimp-extender' ) . '.</p>';
+			if ( isset( $interest_groupings[ 'error' ] ) ) {
+				if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 					require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 					$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-					$error_logging->yikes_easy_mailchimp_write_to_error_log( $interest_groupings['error'], __( "Get Interest Groups" , 'yikes-inc-easy-mailchimp-extender' ), "Edit Form Page" );
+					$error_logging->yikes_easy_mailchimp_write_to_error_log( $interest_groupings[ 'error' ], __( "Get Interest Groups", 'yikes-inc-easy-mailchimp-extender' ), "Edit Form Page" );
 				}
 			}
 
 
 		} else {
-			wp_die( __( 'Oh No!' , 'yikes-inc-easy-mailchimp-extender' ) , __( 'Error' , 'yikes-inc-easy-mailchimp-extender' ) );
+			wp_die( __( 'Oh No!', 'yikes-inc-easy-mailchimp-extender' ), __( 'Error', 'yikes-inc-easy-mailchimp-extender' ) );
 		}
 
 		/* Confirm we've retreived our form data */
-		if( empty( $form ) ) {
+		if ( empty( $form ) ) {
 
-			wp_die( __( "We've encountered an error. Please try again. If the error persists, please contact support." , 'yikes-inc-easy-mailchimp-extender' ) , __( 'Error' , 'yikes-inc-easy-mailchimp-extender' ) );
+			wp_die( __( "We've encountered an error. Please try again. If the error persists, please contact support.", 'yikes-inc-easy-mailchimp-extender' ), __( 'Error', 'yikes-inc-easy-mailchimp-extender' ) );
 
 		} else {
 
@@ -149,22 +149,22 @@ 
 				add_query_arg(
 					array(
 						'action' => 'yikes-easy-mc-update-form',
-						'nonce' => wp_create_nonce( 'update-mailchimp-form'.-$form['id'] )
+						'nonce' => wp_create_nonce( 'update-mailchimp-form' . -$form[ 'id' ] )
 					)
 				)
 			);
 			/* Display Our Form */
 			?>
 				<!-- Freddie Logo -->
-				<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" />
+				<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" />
 
-				<h1>YIKES Easy Forms for MailChimp | <?php echo __( 'Edit' , 'yikes-inc-easy-mailchimp-extender' ) . ' ' . $form['form_name']; ?></h1>
+				<h1>YIKES Easy Forms for MailChimp | <?php echo __( 'Edit', 'yikes-inc-easy-mailchimp-extender' ) . ' ' . $form[ 'form_name' ]; ?></h1>
 
 				<!-- Settings Page Description -->
-				<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Update this MailChimp form\'s fields, styles and settings below.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+				<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Update this MailChimp form\'s fields, styles and settings below.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
 				<?php
-				if( isset( $_REQUEST['updated-form'] ) && $_REQUEST['updated-form'] == 'true' ) {
+				if ( isset( $_REQUEST[ 'updated-form' ] ) && $_REQUEST[ 'updated-form' ] == 'true' ) {
 					?>
 					<div class="updated manage-form-admin-notice">
 						<p><?php _e( 'Opt-in form successfully updated.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -188,15 +188,15 @@ 
 									<div class="inside">
 
 										<label for="form-name">
-											<h3 class="bg-transparent"><?php _e( 'Form Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
-											<input autocomplete="disabled" id="form-name" name="form-name" type="text" value="<?php echo stripslashes( esc_html( $form['form_name'] ) ); ?>" class="widefat" />
-											<p class="description"><?php _e( "The title of this signup form." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+											<h3 class="bg-transparent"><?php _e( 'Form Name', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
+											<input autocomplete="disabled" id="form-name" name="form-name" type="text" value="<?php echo stripslashes( esc_html( $form[ 'form_name' ] ) ); ?>" class="widefat" />
+											<p class="description"><?php _e( "The title of this signup form.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 										</label>
 
 										<label for="form-description">
-											<h3 class="bg-transparent"><?php _e( 'Form Description' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
-											<textarea name="form-description" id="form-description" class="large-text edit-form-form-description"><?php echo isset( $form['form_description'] ) ? stripslashes( esc_textarea( $form['form_description'] ) ) : ''; ?></textarea>
-											<p class="description"><?php _e( "Descriptions are optional and you may choose to display it to visitors to your site." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+											<h3 class="bg-transparent"><?php _e( 'Form Description', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
+											<textarea name="form-description" id="form-description" class="large-text edit-form-form-description"><?php echo isset( $form[ 'form_description' ] ) ? stripslashes( esc_textarea( $form[ 'form_description' ] ) ) : ''; ?></textarea>
+											<p class="description"><?php _e( "Descriptions are optional and you may choose to display it to visitors to your site.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 											<p class="description"><?php printf( __( 'To display the number of subscribers for the list associated with this form, use %s in the form description field above.', 'yikes-inc-easy-mailchimp-extender' ), '<code>[yikes-mailchimp-subscriber-count]</code>' ); ?><p>
 										</label>
 
@@ -212,16 +212,16 @@ 
 
 									<ul id="yikes_easy_mc_toolbar_links">
 										<li class="hidden_setting_list">
-											<a class="hidden_setting form-builder selected_hidden_setting" data-attr-container="form-builder" onclick="return false;" title="<?php esc_attr_e( 'Customize Form Fields' , 'yikes-inc-easy-mailchimp-extender' ); ?>" href="#"> <?php _e( 'Form Builder' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+											<a class="hidden_setting form-builder selected_hidden_setting" data-attr-container="form-builder" onclick="return false;" title="<?php esc_attr_e( 'Customize Form Fields', 'yikes-inc-easy-mailchimp-extender' ); ?>" href="#"> <?php _e( 'Form Builder', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 											<div class="selected_setting_triangle"></div>
 										</li>
 										<li class="hidden_setting_list">
-											<a class="hidden_setting form-settings" onclick="return false;" data-attr-container="form-settings" title="<?php esc_attr_e( 'Form Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?>" href="#"> <?php _e( 'Form Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+											<a class="hidden_setting form-settings" onclick="return false;" data-attr-container="form-settings" title="<?php esc_attr_e( 'Form Settings', 'yikes-inc-easy-mailchimp-extender' ); ?>" href="#"> <?php _e( 'Form Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 										</li>
 										<li class="hidden_setting_list">
-											<a class="hidden_setting error-messages" onclick="return false;" data-attr-container="error-messages" title="<?php esc_attr_e( 'Customize Form Messages' , 'yikes-inc-easy-mailchimp-extender' ); ?>" href="#"> <?php _e( 'Custom Messages' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+											<a class="hidden_setting error-messages" onclick="return false;" data-attr-container="error-messages" title="<?php esc_attr_e( 'Customize Form Messages', 'yikes-inc-easy-mailchimp-extender' ); ?>" href="#"> <?php _e( 'Custom Messages', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 										</li>
-										<?php do_action( 'yikes-mailchimp-edit-form-section-links' , $form ); ?>
+										<?php do_action( 'yikes-mailchimp-edit-form-section-links', $form ); ?>
 									</ul>
 
 								</div>
@@ -242,22 +242,22 @@ 
 														<div class="meta-box-sortables ui-sortable">
 															<div class="postbox yikes-easy-mc-postbox">
 																<!-- container title -->
-																<h3 class="edit-form-title"><?php _e( 'Form Builder' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
-																<p id="edit-form-description" class="description"><?php _e( 'Select fields from the right to add to this form, you can click a field to reveal advanced options, or drag it to re-arrange its position in the form.' , 'yikes-inc-easy-mailchimp-extender' );?></p>
+																<h3 class="edit-form-title"><?php _e( 'Form Builder', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
+																<p id="edit-form-description" class="description"><?php _e( 'Select fields from the right to add to this form, you can click a field to reveal advanced options, or drag it to re-arrange its position in the form.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 																<div id="form-builder-container" class="inside">
 																	<!-- #poststuff -->
-																	<?php echo $this->generate_form_editor( json_decode( $form['fields'] , true ) , $form['list_id'] , $available_merge_variables , isset( $interest_groupings ) ? $interest_groupings : array() ); ?>
+																	<?php echo $this->generate_form_editor( json_decode( $form[ 'fields' ], true ), $form[ 'list_id' ], $available_merge_variables, isset( $interest_groupings ) ? $interest_groupings : array() ); ?>
 																</div>
 
 																<!-- Bulk Delete Form Fields -->
-																<a href="#" class="clear-form-fields" <?php if( isset( $form['fields'] ) && count( json_decode( $form['fields'] , true ) ) <= 0 ) { ?> style="display:none;" <?php } ?>><?php _e( 'Clear Form Fields', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+																<a href="#" class="clear-form-fields" <?php if ( isset( $form[ 'fields' ] ) && count( json_decode( $form[ 'fields' ], true ) ) <= 0 ) { ?> style="display:none;" <?php } ?>><?php _e( 'Clear Form Fields', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 
 																<?php
-																	$display_none = ( isset( $form['fields'] ) && count( json_decode( $form['fields'] , true ) ) <= 0 ) ? 'display:none;' : '';
+																	$display_none = ( isset( $form[ 'fields' ] ) && count( json_decode( $form[ 'fields' ], true ) ) <= 0 ) ? 'display:none;' : '';
 																?>
 
 																<!-- Save Fields Button -->
-																<?php echo submit_button( __( 'Update Form' ) , 'primary' , '' , false , array( 'onclick' => '', 'style' => 'float:right;margin-right:12px;'.$display_none ) ); ?>
+																<?php echo submit_button( __( 'Update Form' ), 'primary', '', false, array( 'onclick' => '', 'style' => 'float:right;margin-right:12px;' . $display_none ) ); ?>
 
 																<!-- .inside -->
 															</div>
@@ -270,15 +270,15 @@ 
 													<div id="postbox-container-1" class="postbox-container">
 														<div class="meta-box-sortables">
 															<div class="postbox yikes-easy-mc-postbox">
-																<h3 class="edit-form-title"><span><?php _e( "Form Fields &amp; Interest Groups" , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
+																<h3 class="edit-form-title"><span><?php _e( "Form Fields &amp; Interest Groups", 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
 																<div class="inside">
 
 																	<h3 class="nav-tab-wrapper mv_ig_list">
-																		<a href="#" class="nav-tab nav-tab-active" alt="merge-variables"><div class="arrow-down"></div><?php _e( 'Form Fields' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
-																		<?php if( !isset( $merge_variable_error ) ) { ?>
-																			<a href="#" class="nav-tab"><?php _e( 'Interest Groups' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+																		<a href="#" class="nav-tab nav-tab-active" alt="merge-variables"><div class="arrow-down"></div><?php _e( 'Form Fields', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+																		<?php if ( ! isset( $merge_variable_error ) ) { ?>
+																			<a href="#" class="nav-tab"><?php _e( 'Interest Groups', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 																		<?php } else { ?>
-																			<a href="#" class="nav-tab no-interest-groups-found-message" disabled="disabled" title="<?php _e( "No Interest Groups Exist" , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Interest Groups' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+																			<a href="#" class="nav-tab no-interest-groups-found-message" disabled="disabled" title="<?php _e( "No Interest Groups Exist", 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Interest Groups', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 																		<?php } ?>
 																	</h3>
 
@@ -286,11 +286,11 @@ 
 
 																		<div id="merge-variables-container" class="list-container">
 																			<?php
-																				if( ! isset( $merge_variable_error ) ) {
+																				if ( ! isset( $merge_variable_error ) ) {
 																					// build a list of available merge variables,
 																					// but exclude the ones already assigned to the form
-																					echo '<p class="description">' . __( "Select a field below to add to the form builder." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
-																					$this->build_available_merge_vars( json_decode( $form['fields'] , true ) , $available_merge_variables );
+																					echo '<p class="description">' . __( "Select a field below to add to the form builder.", 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
+																					$this->build_available_merge_vars( json_decode( $form[ 'fields' ], true ), $available_merge_variables );
 																				} else {
 																					echo $merge_variable_error;
 																				}
@@ -299,14 +299,14 @@ 
 
 																		<div id="interest-groups-container" class="list-container">
 																			<?php
-																				if( isset( $interest_groupings ) && ! isset( $interest_groupings['error'] ) ) {
+																				if ( isset( $interest_groupings ) && ! isset( $interest_groupings[ 'error' ] ) ) {
 																					// build a list of available merge variables,
 																					// but exclude the ones already assigned to the form
-																					echo '<p class="description">' . __( "Select an interest group below to add to the form builder." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
+																					echo '<p class="description">' . __( "Select an interest group below to add to the form builder.", 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
 																					// $this->build_available_merge_vars( json_decode( $form['fields'] , true ) , $available_merge_variables );
-																					$this->build_available_interest_groups( json_decode( $form['fields'] , true ) , $interest_groupings , $form['list_id'] );
+																					$this->build_available_interest_groups( json_decode( $form[ 'fields' ], true ), $interest_groupings, $form[ 'list_id' ] );
 																				} else {
-																					echo '<p class="description">' . $interest_groupings['error'] . '</p>';
+																					echo '<p class="description">' . $interest_groupings[ 'error' ] . '</p>';
 																				}
 																			?>
 																		</div>
@@ -339,19 +339,19 @@ 
 													<div id="post-body-content">
 														<div class="meta-box-sortables ui-sortable">
 															<div class="postbox yikes-easy-mc-postbox">
-																<h3 class="edit-form-title"><span><?php _e( "Additional Form Settings" , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
+																<h3 class="edit-form-title"><span><?php _e( "Additional Form Settings", 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
 
 																<div class="inside form-settings-container">
 
-																	<p class="edit-form-description"><?php _e( "Adjust some additional form settings below." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+																	<p class="edit-form-description"><?php _e( "Adjust some additional form settings below.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
 																	<!-- begin form classes section -->
 																	<strong class="section-title first"><?php _e( 'Overall Form Classes', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 																	<section class="section-interior">
 
 																		<!-- form classes -->
-																		<label for="yikes-easy-mc-form-class-names"><strong><?php _e( 'Form Classes' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-																			<input type="text" class="widefat" name="yikes-easy-mc-form-class-names" id="yikes-easy-mc-form-class-names" value="<?php echo $form_settings['yikes-easy-mc-form-class-names']; ?>" placeholder="<?php _e( 'Add additional classes to this opt-in form.', 'yikes-inc-easy-mailchimp-extender' ); ?>" >
+																		<label for="yikes-easy-mc-form-class-names"><strong><?php _e( 'Form Classes', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+																			<input type="text" class="widefat" name="yikes-easy-mc-form-class-names" id="yikes-easy-mc-form-class-names" value="<?php echo $form_settings[ 'yikes-easy-mc-form-class-names' ]; ?>" placeholder="<?php _e( 'Add additional classes to this opt-in form.', 'yikes-inc-easy-mailchimp-extender' ); ?>" >
 																			<p class="description"><?php printf( __( 'Add additional class names to the %s element.', 'yikes-inc-easy-mailchimp-extender' ), '<code>' . htmlentities( '<form>' ) . '</code>' ); ?></p>
 																		</label>
 
@@ -364,12 +364,12 @@ 
 
 																		<!-- setup the checked state here -->
 																		<!-- inline form -->
-																		<strong><?php _e( 'Inline Form' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+																		<strong><?php _e( 'Inline Form', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 																		<label class="inline-form-label">
-																			<input type="radio" name="yikes-easy-mc-inline-form[]" value="1" <?php checked( $form_settings['yikes-easy-mc-inline-form'], '1' ); ?>/><?php _e( 'Enable', 'yikes-inc-easy-mailchimp-extender' ); ?>
+																			<input type="radio" name="yikes-easy-mc-inline-form[]" value="1" <?php checked( $form_settings[ 'yikes-easy-mc-inline-form' ], '1' ); ?>/><?php _e( 'Enable', 'yikes-inc-easy-mailchimp-extender' ); ?>
 																		</label>
 																		<label class="inline-form-label">
-																			<input type="radio" name="yikes-easy-mc-inline-form[]" value="0" <?php checked( $form_settings['yikes-easy-mc-inline-form'], '0' ); ?> /><?php _e( 'Disable', 'yikes-inc-easy-mailchimp-extender' ); ?>
+																			<input type="radio" name="yikes-easy-mc-inline-form[]" value="0" <?php checked( $form_settings[ 'yikes-easy-mc-inline-form' ], '0' ); ?> /><?php _e( 'Disable', 'yikes-inc-easy-mailchimp-extender' ); ?>
 																		</label>
 																		<p class="description"><?php _e( 'Programatically setup this form so that all fields are on the same line.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 																		<p class="description"><?php printf( __( 'If you are having issues with your theme not displaying the inline form properly, please see the following %s.', 'yikes-inc-easy-mailchimp-extender' ), '<a href="https://yikesplugins.com/support/knowledge-base/my-form-fields-are-not-fully-inline-after-enabling-the-inline-form-option-how-come/" target="_blank">' . __( 'knowledge base article', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ); ?></p>
@@ -382,30 +382,30 @@ 
 																	<section class="section-interior">
 
 																		<!-- Submit button type -->
-																		<strong><?php _e( 'Submit Button Type' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+																		<strong><?php _e( 'Submit Button Type', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 																		<label class="inline-form-label">
-																			<input type="radio" onclick="toggle_nested_section( jQuery(this) );" name="yikes-easy-mc-submit-button-type[]" value="text" <?php checked( $form_settings['yikes-easy-mc-submit-button-type'], 'text' ); ?> /><?php _e( 'Text', 'yikes-inc-easy-mailchimp-extender' ); ?>
+																			<input type="radio" onclick="toggle_nested_section( jQuery(this) );" name="yikes-easy-mc-submit-button-type[]" value="text" <?php checked( $form_settings[ 'yikes-easy-mc-submit-button-type' ], 'text' ); ?> /><?php _e( 'Text', 'yikes-inc-easy-mailchimp-extender' ); ?>
 																		</label>
 																		<label class="inline-form-label">
-																			<input type="radio" onclick="toggle_nested_section( jQuery(this) );" name="yikes-easy-mc-submit-button-type[]" value="image" <?php checked( $form_settings['yikes-easy-mc-submit-button-type'], 'image' ); ?> /><?php _e( 'Image', 'yikes-inc-easy-mailchimp-extender' ); ?>
+																			<input type="radio" onclick="toggle_nested_section( jQuery(this) );" name="yikes-easy-mc-submit-button-type[]" value="image" <?php checked( $form_settings[ 'yikes-easy-mc-submit-button-type' ], 'image' ); ?> /><?php _e( 'Image', 'yikes-inc-easy-mailchimp-extender' ); ?>
 																		</label>
 																		<p class="description"><?php _e( 'Select the submit button type for this form.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 																		<!-- end submit button type -->
 
 																			<!-- Text submit button type -->
-																			<section class="submit-button-type-text nested-child<?php if( $form_settings['yikes-easy-mc-submit-button-type'] == 'image' ) { echo ' hidden'; } ?>">
+																			<section class="submit-button-type-text nested-child<?php if ( $form_settings[ 'yikes-easy-mc-submit-button-type' ] == 'image' ) { echo ' hidden'; } ?>">
 																				<!-- submit button text -->
-																				<label for="yikes-easy-mc-submit-button-text"><strong><?php _e( 'Submit Button Text' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-																					<input type="text" class="widefat" name="yikes-easy-mc-submit-button-text" id="yikes-easy-mc-submit-button-text" value="<?php echo $form_settings['yikes-easy-mc-submit-button-text']; ?>" placeholder="<?php _e( 'Submit', 'yikes-inc-easy-mailchimp-extender' ); ?>">
+																				<label for="yikes-easy-mc-submit-button-text"><strong><?php _e( 'Submit Button Text', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+																					<input type="text" class="widefat" name="yikes-easy-mc-submit-button-text" id="yikes-easy-mc-submit-button-text" value="<?php echo $form_settings[ 'yikes-easy-mc-submit-button-text' ]; ?>" placeholder="<?php _e( 'Submit', 'yikes-inc-easy-mailchimp-extender' ); ?>">
 																					<p class="description"><?php printf( __( 'Set the submit button text. Leaving this blank will default to %s.', 'yikes-inc-easy-mailchimp-extender' ), '"' . __( 'Submit', 'yikes-inc-easy-mailchimp-extender' ) . '"' ); ?></p>
 																				</label>
 																			</section>
 																			<!-- end text submit button type -->
 
 																			<!-- Image submit button type -->
-																			<section class="submit-button-type-image nested-child<?php if( $form_settings['yikes-easy-mc-submit-button-type'] == 'text' ) { echo ' hidden'; } ?>">
-																				<label for="yikes-easy-mc-submit-button-image"><strong><?php _e( 'Submit Button URL' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-																					<input type="text" class="widefat" name="yikes-easy-mc-submit-button-image" id="yikes-easy-mc-submit-button-image" value="<?php echo $form_settings['yikes-easy-mc-submit-button-image']; ?>" placeholder="<?php _e( 'http://', 'yikes-inc-easy-mailchimp-extender' ); ?>">
+																			<section class="submit-button-type-image nested-child<?php if ( $form_settings[ 'yikes-easy-mc-submit-button-type' ] == 'text' ) { echo ' hidden'; } ?>">
+																				<label for="yikes-easy-mc-submit-button-image"><strong><?php _e( 'Submit Button URL', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+																					<input type="text" class="widefat" name="yikes-easy-mc-submit-button-image" id="yikes-easy-mc-submit-button-image" value="<?php echo $form_settings[ 'yikes-easy-mc-submit-button-image' ]; ?>" placeholder="<?php _e( 'http://', 'yikes-inc-easy-mailchimp-extender' ); ?>">
 																					<p class="description"><?php _e( 'Enter the URL of an image you would like to use as the submit button for this form.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 																				</label>
 																			</section>
@@ -413,8 +413,8 @@ 
 
 
 																		<!-- submit button classes -->
-																		<label for="yikes-easy-mc-form-submit-button-classes"><strong style="float:left;"><?php _e( 'Submit Button Classes' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-																			<input type="text" class="widefat" name="yikes-easy-mc-submit-button-classes" id="yikes-easy-mc-submit-button-classes" value="<?php echo $form_settings['yikes-easy-mc-submit-button-classes']; ?>" placeholder="<?php _e( 'Add additional classes to this submit button.', 'yikes-inc-easy-mailchimp-extender' ); ?>" >
+																		<label for="yikes-easy-mc-form-submit-button-classes"><strong style="float:left;"><?php _e( 'Submit Button Classes', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+																			<input type="text" class="widefat" name="yikes-easy-mc-submit-button-classes" id="yikes-easy-mc-submit-button-classes" value="<?php echo $form_settings[ 'yikes-easy-mc-submit-button-classes' ]; ?>" placeholder="<?php _e( 'Add additional classes to this submit button.', 'yikes-inc-easy-mailchimp-extender' ); ?>" >
 																			<p class="description"><?php _e( 'Add custom classes to the submit button.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 																		</label>
 																		<!-- end submit button classes -->
@@ -427,45 +427,45 @@ 
 																	<section class="section-interior">
 																		<!-- Schedule form -->
 																		<label class="inline-form-label">
-																			<input type="checkbox" onclick="toggle_nested_section( jQuery(this) );" name="yikes-easy-mc-form-schedule" value="1" <?php checked( $form_settings['yikes-easy-mc-form-schedule'], '1' ); ?>/><?php _e( 'Schedule Form', 'yikes-inc-easy-mailchimp-extender' ); ?>
+																			<input type="checkbox" onclick="toggle_nested_section( jQuery(this) );" name="yikes-easy-mc-form-schedule" value="1" <?php checked( $form_settings[ 'yikes-easy-mc-form-schedule' ], '1' ); ?>/><?php _e( 'Schedule Form', 'yikes-inc-easy-mailchimp-extender' ); ?>
 																		</label>
 																		<p class="description" style="margin-bottom:0;"><?php _e( 'Set a time period that this form should be active on your site. (mm/dd/yyyy)', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 																		<p class="description" style="margin: 0 0 .5em 0;"><?php _e( 'Once the end date & time have passed, users will no longer be able to signup for your mailing list.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 																			<!-- Start Date Limitation Nested -->
-																			<section class="date-restirction-section nested-child<?php if( $form_settings['yikes-easy-mc-form-schedule'] == '0' ) { echo ' hidden'; } ?>">
+																			<section class="date-restirction-section nested-child<?php if ( $form_settings[ 'yikes-easy-mc-form-schedule' ] == '0' ) { echo ' hidden'; } ?>">
 																				<!-- Start Date -->
-																				<label for="yikes-easy-mc-form-restriction-start-date"><strong><?php _e( 'Start Date' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-																					<input type="text" class="date-picker" name="yikes-easy-mc-form-restriction-start-date" id="yikes-easy-mc-form-restriction-start-date" value="<?php echo date( $this->yikes_jQuery_datepicker_date_format( get_option( 'date_format' ) ), $form_settings['yikes-easy-mc-form-restriction-start'] ); ?>" >
+																				<label for="yikes-easy-mc-form-restriction-start-date"><strong><?php _e( 'Start Date', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+																					<input type="text" class="date-picker" name="yikes-easy-mc-form-restriction-start-date" id="yikes-easy-mc-form-restriction-start-date" value="<?php echo date( $this->yikes_jQuery_datepicker_date_format( get_option( 'date_format' ) ), $form_settings[ 'yikes-easy-mc-form-restriction-start' ] ); ?>" >
 																					<?php _e( 'at', 'yikes-inc-easy-mailchimp-extender' ); ?>
 																				</label>
 
 																				<!-- Start Time -->
-																				<label for="yikes-easy-mc-form-restriction-start-time"><strong><?php _e( 'Start Time' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-																					<input type="text" class="time-picker" name="yikes-easy-mc-form-restriction-start-time" id="yikes-easy-mc-form-restriction-start-time" value="<?php echo date( 'g:iA', $form_settings['yikes-easy-mc-form-restriction-start'] ); ?>" >
+																				<label for="yikes-easy-mc-form-restriction-start-time"><strong><?php _e( 'Start Time', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+																					<input type="text" class="time-picker" name="yikes-easy-mc-form-restriction-start-time" id="yikes-easy-mc-form-restriction-start-time" value="<?php echo date( 'g:iA', $form_settings[ 'yikes-easy-mc-form-restriction-start' ] ); ?>" >
 																				</label>
 																				<p class="description"><?php _e( 'Set the dates that this form should display on your site.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 																			</section>
 																			<!-- end Start Date Limitation Nested -->
 
 																			<!-- End Date Limitation Nested -->
-																			<section class="date-restirction-section nested-child<?php if( $form_settings['yikes-easy-mc-form-schedule'] == '0' ) { echo ' hidden'; } ?> last">
+																			<section class="date-restirction-section nested-child<?php if ( $form_settings[ 'yikes-easy-mc-form-schedule' ] == '0' ) { echo ' hidden'; } ?> last">
 																				<!-- End Date -->
-																				<label for="yikes-easy-mc-form-restriction-end-date"><strong><?php _e( 'End Date' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-																					<input type="text" class="date-picker" name="yikes-easy-mc-form-restriction-end-date" id="yikes-easy-mc-form-restriction-end-date" value="<?php echo date( $this->yikes_jQuery_datepicker_date_format( get_option( 'date_format' ) ), $form_settings['yikes-easy-mc-form-restriction-end'] ); ?>" >
+																				<label for="yikes-easy-mc-form-restriction-end-date"><strong><?php _e( 'End Date', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+																					<input type="text" class="date-picker" name="yikes-easy-mc-form-restriction-end-date" id="yikes-easy-mc-form-restriction-end-date" value="<?php echo date( $this->yikes_jQuery_datepicker_date_format( get_option( 'date_format' ) ), $form_settings[ 'yikes-easy-mc-form-restriction-end' ] ); ?>" >
 																					<?php _e( 'at', 'yikes-inc-easy-mailchimp-extender' ); ?>
 																				</label>
 
 																				<!-- End Time -->
-																				<label for="yikes-easy-mc-form-restriction-end-time"><strong><?php _e( 'End Time' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-																					<input type="text" class="time-picker" name="yikes-easy-mc-form-restriction-end-time" id="yikes-easy-mc-form-restriction-end-time" value="<?php echo date( 'g:iA', $form_settings['yikes-easy-mc-form-restriction-end'] ); ?>" >
+																				<label for="yikes-easy-mc-form-restriction-end-time"><strong><?php _e( 'End Time', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+																					<input type="text" class="time-picker" name="yikes-easy-mc-form-restriction-end-time" id="yikes-easy-mc-form-restriction-end-time" value="<?php echo date( 'g:iA', $form_settings[ 'yikes-easy-mc-form-restriction-end' ] ); ?>" >
 																				</label>
 																				<p class="description"><?php _e( 'Set the dates that this form should no longer display on your site.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
 																				<!-- Form pending message -->
-																				<label for="yikes-easy-mc-form-restriction-pending-message"><strong><?php _e( 'Pending Message' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+																				<label for="yikes-easy-mc-form-restriction-pending-message"><strong><?php _e( 'Pending Message', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 																					<?php
 																						wp_editor(
-																							$form_settings['yikes-easy-mc-form-restriction-pending-message'],
+																							$form_settings[ 'yikes-easy-mc-form-restriction-pending-message' ],
 																							'yikes-easy-mc-form-restriction-pending-message',
 																							array(
 																								'editor_class' => 'yikes-easy-mc-form-restriction-pending-message',
@@ -477,10 +477,10 @@ 
 																				<p class="description"><?php _e( 'Set the message that should display prior to the form being active.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
 																				<!-- form expired message -->
-																				<label for="yikes-easy-mc-form-restriction-expired-message"><strong><?php _e( 'Expired Message' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+																				<label for="yikes-easy-mc-form-restriction-expired-message"><strong><?php _e( 'Expired Message', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 																					<?php
 																						wp_editor(
-																							$form_settings['yikes-easy-mc-form-restriction-expired-message'],
+																							$form_settings[ 'yikes-easy-mc-form-restriction-expired-message' ],
 																							'yikes-easy-mc-form-restriction-expired-message',
 																							array(
 																								'editor_class' => 'yikes-easy-mc-form-restriction-expired-message',
@@ -495,16 +495,16 @@ 
 
 																			<!-- Require Users to be Logged In -->
 																			<label class="inline-form-label">
-																				<input type="checkbox" onclick="toggle_nested_section( jQuery(this) );" name="yikes-easy-mc-form-login-required" value="1" <?php checked( $form_settings['yikes-easy-mc-form-login-required'], '1' ); ?> /><?php _e( 'Require Login', 'yikes-inc-easy-mailchimp-extender' ); ?>
+																				<input type="checkbox" onclick="toggle_nested_section( jQuery(this) );" name="yikes-easy-mc-form-login-required" value="1" <?php checked( $form_settings[ 'yikes-easy-mc-form-login-required' ], '1' ); ?> /><?php _e( 'Require Login', 'yikes-inc-easy-mailchimp-extender' ); ?>
 																			</label>
 																			<p class="description"><?php _e( 'Require users to be logged in before they can view and submit this opt-in form.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
 																			<!-- Require Login Message -->
-																			<section class="login-restirction-section nested-child<?php if( $form_settings['yikes-easy-mc-form-login-required'] == '0' ) { echo ' hidden'; } ?>">
-																				<label for="yikes-easy-mc-form-restriction-login-message"><strong><?php _e( 'Required Login Message' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+																			<section class="login-restirction-section nested-child<?php if ( $form_settings[ 'yikes-easy-mc-form-login-required' ] == '0' ) { echo ' hidden'; } ?>">
+																				<label for="yikes-easy-mc-form-restriction-login-message"><strong><?php _e( 'Required Login Message', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 																					<?php
 																						wp_editor(
-																							$form_settings['yikes-easy-mc-form-restriction-login-message'],
+																							$form_settings[ 'yikes-easy-mc-form-restriction-login-message' ],
 																							'yikes-easy-mc-form-restriction-login-message',
 																							array(
 																								'editor_class' => 'yikes-easy-mc-form-restriction-login-message',
@@ -533,14 +533,14 @@ 
 													<div id="postbox-container-1" class="postbox-container">
 														<div class="meta-box-sortables">
 															<div class="postbox yikes-easy-mc-postbox">
-																<h3 class="edit-form-title"><span><?php _e( "Form Settings Explained" , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
+																<h3 class="edit-form-title"><span><?php _e( "Form Settings Explained", 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
 																<div class="inside">
 
 																	<ul>
-																		<li><strong><?php _e( 'Classes' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'Add additional classes to this form, allowing you to target it more easily for customization via CSS.' , 'yikes-inc-easy-mailchimp-extender' ); ?></li>
-																		<li><strong><?php _e( 'Form Layout' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'Toggle the layout of this form between single column and an inline layout. The inline layout places all of your form fields and the submit button on a single line.' , 'yikes-inc-easy-mailchimp-extender' ); ?></li>
-																		<li><strong><?php _e( 'Submit Button' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'Adjust setting specific to the submit button. Change the submit button text, or set it to a specified image. Use the "Submit Button Classes" to  assign additional classes to your submit button - ensuring it fits better into your theme.' , 'yikes-inc-easy-mailchimp-extender' ); ?></li>
-																		<li><strong><?php _e( 'Form Restrictions' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'Adjust the restrictions for this form. Limit form visibility to a given time period, require users to be logged in to sign up or combine the two!' , 'yikes-inc-easy-mailchimp-extender' ); ?></li>
+																		<li><strong><?php _e( 'Classes', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'Add additional classes to this form, allowing you to target it more easily for customization via CSS.', 'yikes-inc-easy-mailchimp-extender' ); ?></li>
+																		<li><strong><?php _e( 'Form Layout', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'Toggle the layout of this form between single column and an inline layout. The inline layout places all of your form fields and the submit button on a single line.', 'yikes-inc-easy-mailchimp-extender' ); ?></li>
+																		<li><strong><?php _e( 'Submit Button', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'Adjust setting specific to the submit button. Change the submit button text, or set it to a specified image. Use the "Submit Button Classes" to  assign additional classes to your submit button - ensuring it fits better into your theme.', 'yikes-inc-easy-mailchimp-extender' ); ?></li>
+																		<li><strong><?php _e( 'Form Restrictions', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'Adjust the restrictions for this form. Limit form visibility to a given time period, require users to be logged in to sign up or combine the two!', 'yikes-inc-easy-mailchimp-extender' ); ?></li>
 																	</ul>
 
 																</div>
@@ -568,41 +568,41 @@ 
 													<div id="post-body-content">
 														<div class="meta-box-sortables ui-sortable">
 															<div class="postbox yikes-easy-mc-postbox">
-																<h3 class="edit-form-title"><span><?php _e( "Custom Messages" , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
+																<h3 class="edit-form-title"><span><?php _e( "Custom Messages", 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
 
 																<div class="inside error-message-container">
 																	<?php
 																		// build our default options
 																		$error_message_array = array(
-																			'success' => __( 'Thank You for subscribing! Check your email for the confirmation message.' , 'yikes-inc-easy-mailchimp-extender' ),
-																			'general-error' => __( "Whoops! It looks like something went wrong. Please try again." , 'yikes-inc-easy-mailchimp-extender' ),
-																			'invalid-email' => __( "Please provide a valid email address." , 'yikes-inc-easy-mailchimp-extender' ),
-																			'email-exists-error' => __( "The provided email is already subscribed to this list." , 'yikes-inc-easy-mailchimp-extender' ),
-																			'update-link' => __ ( "To update your MailChimp profile, please [link]click to send yourself an update link[/link].", 'yikes-inc-easy-mailchimp-extender' ),
+																			'success' => __( 'Thank You for subscribing! Check your email for the confirmation message.', 'yikes-inc-easy-mailchimp-extender' ),
+																			'general-error' => __( "Whoops! It looks like something went wrong. Please try again.", 'yikes-inc-easy-mailchimp-extender' ),
+																			'invalid-email' => __( "Please provide a valid email address.", 'yikes-inc-easy-mailchimp-extender' ),
+																			'email-exists-error' => __( "The provided email is already subscribed to this list.", 'yikes-inc-easy-mailchimp-extender' ),
+																			'update-link' => __( "To update your MailChimp profile, please [link]click to send yourself an update link[/link].", 'yikes-inc-easy-mailchimp-extender' ),
 																		);
-																		$global_error_messages = get_option( 'yikes-easy-mc-global-error-messages' , $error_message_array );
+																		$global_error_messages = get_option( 'yikes-easy-mc-global-error-messages', $error_message_array );
 																	?>
-																	<p class="edit-form-description"><?php _e( "Enter your custom messages for this form below. Leave the field blank to use the default global error message." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+																	<p class="edit-form-description"><?php _e( "Enter your custom messages for this form below. Leave the field blank to use the default global error message.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
 																	<!-- Success Message -->
-																	<label for="yikes-easy-mc-success-message"><strong><?php _e( 'Success Message' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-																		<input type="text" class="widefat" name="yikes-easy-mc-success-message" id="yikes-easy-mc-success-message" value="<?php echo isset( $error_messages['success'] ) ? stripslashes( esc_html( $error_messages['success'] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages['success']; ?>" >
+																	<label for="yikes-easy-mc-success-message"><strong><?php _e( 'Success Message', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+																		<input type="text" class="widefat" name="yikes-easy-mc-success-message" id="yikes-easy-mc-success-message" value="<?php echo isset( $error_messages[ 'success' ] ) ? stripslashes( esc_html( $error_messages[ 'success' ] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages[ 'success' ]; ?>" >
 																	</label>
 																	<!-- General Error Message -->
-																	<label for="yikes-easy-mc-general-error-message"><strong><?php _e( 'General Error Message' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-																		<input type="text" class="widefat" name="yikes-easy-mc-general-error-message" id="yikes-easy-mc-general-error-message" value="<?php echo isset( $error_messages['general-error'] ) ? stripslashes( esc_html( $error_messages['general-error'] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages['general-error']; ?>" >
+																	<label for="yikes-easy-mc-general-error-message"><strong><?php _e( 'General Error Message', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+																		<input type="text" class="widefat" name="yikes-easy-mc-general-error-message" id="yikes-easy-mc-general-error-message" value="<?php echo isset( $error_messages[ 'general-error' ] ) ? stripslashes( esc_html( $error_messages[ 'general-error' ] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages[ 'general-error' ]; ?>" >
 																	</label>
 																	<!-- Invalid Email Address Message -->
-																	<label for="yikes-easy-mc-invalid-email-message"><strong><?php _e( 'Invalid Email' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-																		<input type="text" class="widefat" name="yikes-easy-mc-invalid-email-message" id="yikes-easy-mc-invalid-email-message" value="<?php echo isset( $error_messages['invalid-email'] ) ? stripslashes( esc_html( $error_messages['invalid-email'] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages['invalid-email']; ?>">
+																	<label for="yikes-easy-mc-invalid-email-message"><strong><?php _e( 'Invalid Email', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+																		<input type="text" class="widefat" name="yikes-easy-mc-invalid-email-message" id="yikes-easy-mc-invalid-email-message" value="<?php echo isset( $error_messages[ 'invalid-email' ] ) ? stripslashes( esc_html( $error_messages[ 'invalid-email' ] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages[ 'invalid-email' ]; ?>">
 																	</label>
 																	<!-- Email Address is already subscribed -->
-																	<label for="yikes-easy-mc-user-subscribed-message"><strong><?php _e( 'Email Already Subscribed' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-																		<input type="text" class="widefat" name="yikes-easy-mc-user-subscribed-message" id="yikes-easy-mc-user-subscribed-message" value="<?php echo isset( $error_messages['already-subscribed'] ) ? stripslashes( esc_html( $error_messages['already-subscribed'] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages['email-exists-error']; ?>">
+																	<label for="yikes-easy-mc-user-subscribed-message"><strong><?php _e( 'Email Already Subscribed', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+																		<input type="text" class="widefat" name="yikes-easy-mc-user-subscribed-message" id="yikes-easy-mc-user-subscribed-message" value="<?php echo isset( $error_messages[ 'already-subscribed' ] ) ? stripslashes( esc_html( $error_messages[ 'already-subscribed' ] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages[ 'email-exists-error' ]; ?>">
 																	</label>
 																	<!-- Click the link to update user profile etc. etc. -->
-																	<label for="yikes-easy-mc-user-subscribed-update-link"><strong><?php _e( 'Update Link' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-																		<input type="text" class="widefat" name="yikes-easy-mc-user-update-link" id="yikes-easy-mc-user-update-link" value="<?php echo isset( $error_messages['update-link'] ) ? stripslashes( esc_html( $error_messages['update-link'] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages['update-link']; ?>">
+																	<label for="yikes-easy-mc-user-subscribed-update-link"><strong><?php _e( 'Update Link', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+																		<input type="text" class="widefat" name="yikes-easy-mc-user-update-link" id="yikes-easy-mc-user-update-link" value="<?php echo isset( $error_messages[ 'update-link' ] ) ? stripslashes( esc_html( $error_messages[ 'update-link' ] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages[ 'update-link' ]; ?>">
 																	</label>
 																</div>
 
@@ -617,15 +617,15 @@ 
 													<div id="postbox-container-1" class="postbox-container">
 														<div class="meta-box-sortables">
 															<div class="postbox yikes-easy-mc-postbox">
-																<h3 class="edit-form-title"><span><?php _e( "Error Message Explanation" , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
+																<h3 class="edit-form-title"><span><?php _e( "Error Message Explanation", 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
 																<div class="inside">
 
 																	<ul>
-																		<li><strong><?php _e( 'Success Message' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'The message displayed to the user after they have submitted the form and the data has been successfully sent to MailChimp.' , 'yikes-inc-easy-mailchimp-extender' ); ?></li>
-																		<li><strong><?php _e( 'General Error Message' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'The message displayed to the user after a generic error has occurred.' , 'yikes-inc-easy-mailchimp-extender' ); ?></li>
-																		<li><strong><?php _e( 'Invalid Email' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'The message displayed to the user after they have entered a non-valid email address.' , 'yikes-inc-easy-mailchimp-extender' ); ?></li>
-																		<li><strong><?php _e( 'Email Already Subscribed' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'The message displayed to the user after they attempt to sign up for a mailing list using an email address that is already subscribed.' , 'yikes-inc-easy-mailchimp-extender' ); ?></li>
-																		<li><strong><?php _e( 'Update Link' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'The update link is used when you allow users to generate an update email, when they are already subscribed to a list. Wrap the text you want to use as the link in <code>[link][/link]</code> tags.' , 'yikes-inc-easy-mailchimp-extender' ); ?></li>
+																		<li><strong><?php _e( 'Success Message', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'The message displayed to the user after they have submitted the form and the data has been successfully sent to MailChimp.', 'yikes-inc-easy-mailchimp-extender' ); ?></li>
+																		<li><strong><?php _e( 'General Error Message', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'The message displayed to the user after a generic error has occurred.', 'yikes-inc-easy-mailchimp-extender' ); ?></li>
+																		<li><strong><?php _e( 'Invalid Email', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'The message displayed to the user after they have entered a non-valid email address.', 'yikes-inc-easy-mailchimp-extender' ); ?></li>
+																		<li><strong><?php _e( 'Email Already Subscribed', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'The message displayed to the user after they attempt to sign up for a mailing list using an email address that is already subscribed.', 'yikes-inc-easy-mailchimp-extender' ); ?></li>
+																		<li><strong><?php _e( 'Update Link', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'The update link is used when you allow users to generate an update email, when they are already subscribed to a list. Wrap the text you want to use as the link in <code>[link][/link]</code> tags.', 'yikes-inc-easy-mailchimp-extender' ); ?></li>
 																	</ul>
 
 																</div>
@@ -644,7 +644,7 @@ 
 										</label>
 										<!-- End Error Messages -->
 
-										<?php do_action( 'yikes-mailchimp-edit-form-sections' , $form ); ?>
+										<?php do_action( 'yikes-mailchimp-edit-form-sections', $form ); ?>
 
 									</div>
 									<!-- .inside -->
@@ -659,107 +659,107 @@ 
 						<div id="postbox-container-1" class="postbox-container  yikes-easy-forms-sidebar">
 							<div class="meta-box-sortables">
 								<div class="postbox yikes-easy-mc-postbox">
-									<h3><span><?php _e( 'Form Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
+									<h3><span><?php _e( 'Form Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
 
 									<div class="inside">
 											<p class="inside-section-1">
-												<label for="shortcode"><?php _e( 'Edit Another Form' , 'yikes-inc-easy-mailchimp-extender' ); ?><br />
+												<label for="shortcode"><?php _e( 'Edit Another Form', 'yikes-inc-easy-mailchimp-extender' ); ?><br />
 													<select class="widefat" name="form_switcher" id="form_switcher" onchange="YIKES_Easy_MC_SwitchForm(jQuery(this).val());">
-														<?php foreach( $all_forms as $single_form ) { ?>
-															<option <?php selected( $form_id , $single_form['id'] ); ?>value="<?php echo $single_form['id']; ?>"><?php echo $single_form['form_name']; ?></option>
+														<?php foreach ( $all_forms as $single_form ) { ?>
+															<option <?php selected( $form_id, $single_form[ 'id' ] ); ?>value="<?php echo $single_form[ 'id' ]; ?>"><?php echo $single_form[ 'form_name' ]; ?></option>
 														<?php } ?>
 													</select>
 												</label>
 											</p>
 
 											<p class="inside-section-2">
-												<label for="shortcode"><?php _e( 'Shortcode' , 'yikes-inc-easy-mailchimp-extender' ); ?><br />
-													<input type="text" onclick="this.setSelectionRange(0, this.value.length)" class="widefat shortcode-input-field" readonly value='[yikes-mailchimp form="<?php echo $form['id']; ?>"]' />
+												<label for="shortcode"><?php _e( 'Shortcode', 'yikes-inc-easy-mailchimp-extender' ); ?><br />
+													<input type="text" onclick="this.setSelectionRange(0, this.value.length)" class="widefat shortcode-input-field" readonly value='[yikes-mailchimp form="<?php echo $form[ 'id' ]; ?>"]' />
 												</label>
 											</p>
 
 
 										<a href="#" class="expansion-section-title settings-sidebar">
-											<span class="dashicons dashicons-plus"></span><?php _e( 'Associated List Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+											<span class="dashicons dashicons-plus"></span><?php _e( 'Associated List Settings', 'yikes-inc-easy-mailchimp-extender' ); ?>
 										</a>
 										<div class="yikes-mc-settings-expansion-section">
 											<!-- Associated List -->
-											<p class="form-field-container"><!-- necessary to prevent skipping on slideToggle(); --><label for="associated-list"><strong><?php _e( 'Associated List' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-												<select name="associated-list" id="associated-list" <?php if( empty( $list_data['data'] ) ) { echo 'disabled="disabled"'; } ?> onchange="jQuery('.view-list-link').attr( 'href', '<?php echo esc_url( admin_url( 'admin.php?page=yikes-mailchimp-view-list&list-id=' ) ); ?>' + jQuery( this ).val() );">
+											<p class="form-field-container"><!-- necessary to prevent skipping on slideToggle(); --><label for="associated-list"><strong><?php _e( 'Associated List', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+												<select name="associated-list" id="associated-list" <?php if ( empty( $list_data[ 'data' ] ) ) { echo 'disabled="disabled"'; } ?> onchange="jQuery('.view-list-link').attr( 'href', '<?php echo esc_url( admin_url( 'admin.php?page=yikes-mailchimp-view-list&list-id=' ) ); ?>' + jQuery( this ).val() );">
 													<?php
-													if( !empty( $list_data['data'] ) ) {
-														foreach( $list_data['data'] as $mailing_list ) {
+													if ( ! empty( $list_data[ 'data' ] ) ) {
+														foreach ( $list_data[ 'data' ] as $mailing_list ) {
 															?>
-																<option <?php selected( $form['list_id'] , $mailing_list['id'] ); ?> value="<?php echo $mailing_list['id']; ?>"><?php echo stripslashes( $mailing_list['name'] ) . ' (' . $mailing_list['stats']['member_count'] . ') '; ?></option>
+																<option <?php selected( $form[ 'list_id' ], $mailing_list[ 'id' ] ); ?> value="<?php echo $mailing_list[ 'id' ]; ?>"><?php echo stripslashes( $mailing_list[ 'name' ] ) . ' (' . $mailing_list[ 'stats' ][ 'member_count' ] . ') '; ?></option>
 															<?php
 														}
 													} else {
 														?>
-															<option value="no-forms"><?php _e( 'No Lists Found' , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
+															<option value="no-forms"><?php _e( 'No Lists Found', 'yikes-inc-easy-mailchimp-extender' ); ?></option>
 														<?php
 													}
 													?>
 												</select>
-												<?php if( !empty( $list_data['data'] ) ) { ?>
+												<?php if ( ! empty( $list_data[ 'data' ] ) ) { ?>
 													<p class="description view-list">
-														<a href="<?php echo esc_url( admin_url( 'admin.php?page=yikes-mailchimp-view-list&list-id=' . $form['list_id'] ) ); ?>" class="view-list-link"><?php _e( 'View List', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+														<a href="<?php echo esc_url( admin_url( 'admin.php?page=yikes-mailchimp-view-list&list-id=' . $form[ 'list_id' ] ) ); ?>" class="view-list-link"><?php _e( 'View List', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 													</p>
 													<p class="description">
-														<?php _e( "Users who sign up via this form will be added to the list selected above." , 'yikes-inc-easy-mailchimp-extender' ); ?>
+														<?php _e( "Users who sign up via this form will be added to the list selected above.", 'yikes-inc-easy-mailchimp-extender' ); ?>
 													</p>
 												<?php } else { ?>
 													<p class="description">
-														<?php _e( "It looks like you first need to create a list to assign this form to. Head over to" , 'yikes-inc-easy-mailchimp-extender' ); ?> <a href="http://www.MailChimp.com" title="<?php _e( 'Create a new list' , 'yikes-inc-easy-mailchimp-extender' ); ?>">MailChimp</a> <?php _e( 'to create your first list' , 'yikes-inc-easy-mailchimp-extender' ); ?>.
+														<?php _e( "It looks like you first need to create a list to assign this form to. Head over to", 'yikes-inc-easy-mailchimp-extender' ); ?> <a href="http://www.MailChimp.com" title="<?php _e( 'Create a new list', 'yikes-inc-easy-mailchimp-extender' ); ?>">MailChimp</a> <?php _e( 'to create your first list', 'yikes-inc-easy-mailchimp-extender' ); ?>.
 													</p>
 												<?php } ?>
 											</label></p>
 										</div>
 
 										<a href="#" class="expansion-section-title settings-sidebar">
-											<span class="dashicons dashicons-plus"></span><?php _e( 'Opt-in Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+											<span class="dashicons dashicons-plus"></span><?php _e( 'Opt-in Settings', 'yikes-inc-easy-mailchimp-extender' ); ?>
 										</a>
 										<div class="yikes-mc-settings-expansion-section">
 
 											<!-- Single or Double Opt-in -->
 											<?php
-												if( !isset( $optin_settings['optin'] ) ) {
-													$optin_settings['optin'] = '1';
+												if ( ! isset( $optin_settings[ 'optin' ] ) ) {
+													$optin_settings[ 'optin' ] = '1';
 												}
 											?>
-											<p class="form-field-container"><!-- necessary to prevent skipping on slideToggle(); --><label for="single-double-optin"><strong><?php _e( 'Single or Double Opt-in' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+											<p class="form-field-container"><!-- necessary to prevent skipping on slideToggle(); --><label for="single-double-optin"><strong><?php _e( 'Single or Double Opt-in', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 												<span class="edit-form-field-container-span">
-													<label for="single"><input id="single" type="radio" name="single-double-optin" value="0" <?php checked( $optin_settings['optin'] , '0' ); ?>><?php _e( 'Single' , 'yikes-inc-easy-mailchimp-extender' ); ?></label>
-													&nbsp;<label for="double"><input id="double" type="radio" name="single-double-optin" value="1" <?php checked( $optin_settings['optin'] , '1' ); ?>><?php _e( 'Double' , 'yikes-inc-easy-mailchimp-extender' ); ?></label>
+													<label for="single"><input id="single" type="radio" name="single-double-optin" value="0" <?php checked( $optin_settings[ 'optin' ], '0' ); ?>><?php _e( 'Single', 'yikes-inc-easy-mailchimp-extender' ); ?></label>
+													&nbsp;<label for="double"><input id="double" type="radio" name="single-double-optin" value="1" <?php checked( $optin_settings[ 'optin' ], '1' ); ?>><?php _e( 'Double', 'yikes-inc-easy-mailchimp-extender' ); ?></label>
 												</span>
-												<p class="description"><?php _e( "Double opt-in requires users to confirm their email address before being added to a list (recommended)" , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+												<p class="description"><?php _e( "Double opt-in requires users to confirm their email address before being added to a list (recommended)", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 											</label></p>
 
 											<!-- Welcome Email -->
 											<?php
-												if( !isset( $optin_settings['send_welcome_email'] ) ) {
-													$optin_settings['send_welcome_email'] = '1';
+												if ( ! isset( $optin_settings[ 'send_welcome_email' ] ) ) {
+													$optin_settings[ 'send_welcome_email' ] = '1';
 												}
 											?>
-											<p class="form-field-container"><!-- necessary to prevent skipping on slideToggle(); --><label for="send-welcome-email"><strong><?php _e( 'Send Welcome Email' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+											<p class="form-field-container"><!-- necessary to prevent skipping on slideToggle(); --><label for="send-welcome-email"><strong><?php _e( 'Send Welcome Email', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 												<span class="edit-form-field-container-span">
-													<label for="send-welcome"><input id="send-welcome" type="radio" name="send-welcome-email" value="1" <?php checked( $optin_settings['send_welcome_email'] , '1' ); ?>><?php _e( 'Yes' , 'yikes-inc-easy-mailchimp-extender' ); ?></label>
-													&nbsp;<label for="do-not-send-welcome"><input id="do-not-send-welcome" type="radio" name="send-welcome-email" value="0" <?php checked( $optin_settings['send_welcome_email'] , '0' ); ?>><?php _e( 'No' , 'yikes-inc-easy-mailchimp-extender' ); ?></label>
+													<label for="send-welcome"><input id="send-welcome" type="radio" name="send-welcome-email" value="1" <?php checked( $optin_settings[ 'send_welcome_email' ], '1' ); ?>><?php _e( 'Yes', 'yikes-inc-easy-mailchimp-extender' ); ?></label>
+													&nbsp;<label for="do-not-send-welcome"><input id="do-not-send-welcome" type="radio" name="send-welcome-email" value="0" <?php checked( $optin_settings[ 'send_welcome_email' ], '0' ); ?>><?php _e( 'No', 'yikes-inc-easy-mailchimp-extender' ); ?></label>
 												</span>
-												<p class="description"><?php _e( "When a user signs up, should they receive the default welcome email?" , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+												<p class="description"><?php _e( "When a user signs up, should they receive the default welcome email?", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 											</label></p>
 
 											<!-- Update Existing Users -->
 											<?php
-												if( !isset( $optin_settings['update_existing_user'] ) ) {
-													$optin_settings['update_existing_user'] = '1';
+												if ( ! isset( $optin_settings[ 'update_existing_user' ] ) ) {
+													$optin_settings[ 'update_existing_user' ] = '1';
 												}
 											?>
-											<p class="form-field-container"><!-- necessary to prevent skipping on slideToggle(); --><label for="update-existing-user"><strong><?php _e( 'Update Existing Subscriber' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+											<p class="form-field-container"><!-- necessary to prevent skipping on slideToggle(); --><label for="update-existing-user"><strong><?php _e( 'Update Existing Subscriber', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 												<span class="form-field-container-span">
-													<label for="update-user"><input type="radio" id="update-user" onchange="toggleUpdateEmailContainer(this);return false;" name="update-existing-user" value="1" <?php checked( $optin_settings['update_existing_user'] , '1' ); ?>><?php _e( 'Yes' , 'yikes-inc-easy-mailchimp-extender' ); ?></label>
-													&nbsp;<label for="do-not-update-user"><input type="radio" onchange="toggleUpdateEmailContainer(this);return false;" id="do-not-update-user"  name="update-existing-user" value="0" <?php checked( $optin_settings['update_existing_user'] , '0' ); ?>><?php _e( 'No' , 'yikes-inc-easy-mailchimp-extender' ); ?></label>
+													<label for="update-user"><input type="radio" id="update-user" onchange="toggleUpdateEmailContainer(this);return false;" name="update-existing-user" value="1" <?php checked( $optin_settings[ 'update_existing_user' ], '1' ); ?>><?php _e( 'Yes', 'yikes-inc-easy-mailchimp-extender' ); ?></label>
+													&nbsp;<label for="do-not-update-user"><input type="radio" onchange="toggleUpdateEmailContainer(this);return false;" id="do-not-update-user"  name="update-existing-user" value="0" <?php checked( $optin_settings[ 'update_existing_user' ], '0' ); ?>><?php _e( 'No', 'yikes-inc-easy-mailchimp-extender' ); ?></label>
 												</span>
-												<p class="description"><?php printf( __( "Display an update link when a user is already subscribed to the list, allowing them to generate an email where they can update their subscribtion info - instead of displaying a %s message." , "yikes-inc-easy-mailchimp-extender" ), __( '"user already subscribed"', 'yikes-inc-easy-mailchimp-extender' ) ); ?></p>
+												<p class="description"><?php printf( __( "Display an update link when a user is already subscribed to the list, allowing them to generate an email where they can update their subscribtion info - instead of displaying a %s message.", "yikes-inc-easy-mailchimp-extender" ), __( '"user already subscribed"', 'yikes-inc-easy-mailchimp-extender' ) ); ?></p>
 											</label></p>
 
 											<!--
@@ -768,82 +768,82 @@ 
 												- No = Just update the user profile without an email
 											-->
 											<?php
-												$send_update_email = ( isset( $optin_settings['send_update_email'] ) && '' !== $optin_settings['send_update_email'] ) ? $optin_settings['send_update_email'] : 0;
+												$send_update_email = ( isset( $optin_settings[ 'send_update_email' ] ) && '' !== $optin_settings[ 'send_update_email' ] ) ? $optin_settings[ 'send_update_email' ] : 0;
 											?>
-											<p class="form-field-container send-update-email" <?php if ( 1 !== absint( $optin_settings['update_existing_user'] ) ) { ?>style="display:none;"<?php } ?>><!-- necessary to prevent skipping on slideToggle(); --><label for="update-existing-user"><strong><?php _e( 'Send Update Email' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+											<p class="form-field-container send-update-email" <?php if ( 1 !== absint( $optin_settings[ 'update_existing_user' ] ) ) { ?>style="display:none;"<?php } ?>><!-- necessary to prevent skipping on slideToggle(); --><label for="update-existing-user"><strong><?php _e( 'Send Update Email', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 												<span class="form-field-container-span">
-													<label for="update-email"><input type="radio" id="update-email" name="update-existing-email" value="1" <?php checked( $send_update_email , '1' ); ?>><?php _e( 'Yes' , 'yikes-inc-easy-mailchimp-extender' ); ?></label>
-													&nbsp;<label for="do-not-update-email"><input type="radio" id="do-not-update-email"  name="update-existing-email" value="0" <?php checked( $send_update_email , '0' ); ?>><?php _e( 'No' , 'yikes-inc-easy-mailchimp-extender' ); ?></label>
+													<label for="update-email"><input type="radio" id="update-email" name="update-existing-email" value="1" <?php checked( $send_update_email, '1' ); ?>><?php _e( 'Yes', 'yikes-inc-easy-mailchimp-extender' ); ?></label>
+													&nbsp;<label for="do-not-update-email"><input type="radio" id="do-not-update-email"  name="update-existing-email" value="0" <?php checked( $send_update_email, '0' ); ?>><?php _e( 'No', 'yikes-inc-easy-mailchimp-extender' ); ?></label>
 												</span>
-												<em><?php printf( __( "Send an email allowing the user to update their profile, securely. Otherwise, when an existing subscriber re-subscribes to this form, their profile information will be updated without any further interaction." , "yikes-inc-easy-mailchimp-extender" ), __( '"user already subscribed"', 'yikes-inc-easy-mailchimp-extender' ) ); ?></em>
+												<em><?php printf( __( "Send an email allowing the user to update their profile, securely. Otherwise, when an existing subscriber re-subscribes to this form, their profile information will be updated without any further interaction.", "yikes-inc-easy-mailchimp-extender" ), __( '"user already subscribed"', 'yikes-inc-easy-mailchimp-extender' ) ); ?></em>
 											</label></p>
 
 										</div>
 
 										<a href="#" class="expansion-section-title settings-sidebar">
-											<span class="dashicons dashicons-plus"></span><?php _e( 'Submission Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+											<span class="dashicons dashicons-plus"></span><?php _e( 'Submission Settings', 'yikes-inc-easy-mailchimp-extender' ); ?>
 										</a>
 										<div class="yikes-mc-settings-expansion-section">
 											<!-- AJAX form Submission -->
 											<?php
-												if( !isset( $submission_settings['ajax'] ) ) {
-													$submission_settings['ajax'] = '1';
+												if ( ! isset( $submission_settings[ 'ajax' ] ) ) {
+													$submission_settings[ 'ajax' ] = '1';
 												}
 											?>
-											<p class="form-field-container"><!-- necessary to prevent skipping on slideToggle(); --><label for="form-ajax-submission"><strong><?php _e( 'Enable AJAX Submission' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+											<p class="form-field-container"><!-- necessary to prevent skipping on slideToggle(); --><label for="form-ajax-submission"><strong><?php _e( 'Enable AJAX Submission', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 												<span class="form-field-container-span">
-													<label for="enable-ajax"><input type="radio" id="enable-ajax" name="form-ajax-submission" value="1" <?php checked( $submission_settings['ajax'] , '1' ); ?>><?php _e( 'Yes' , 'yikes-inc-easy-mailchimp-extender' ); ?></label>
-													&nbsp;<label for="disable-ajax"><input type="radio" id="disable-ajax"  name="form-ajax-submission" value="0" <?php checked( $submission_settings['ajax'] , '0' ); ?>><?php _e( 'No' , 'yikes-inc-easy-mailchimp-extender' ); ?></label>
+													<label for="enable-ajax"><input type="radio" id="enable-ajax" name="form-ajax-submission" value="1" <?php checked( $submission_settings[ 'ajax' ], '1' ); ?>><?php _e( 'Yes', 'yikes-inc-easy-mailchimp-extender' ); ?></label>
+													&nbsp;<label for="disable-ajax"><input type="radio" id="disable-ajax"  name="form-ajax-submission" value="0" <?php checked( $submission_settings[ 'ajax' ], '0' ); ?>><?php _e( 'No', 'yikes-inc-easy-mailchimp-extender' ); ?></label>
 												</span>
-												<p class="description"><?php _e( "AJAX form submissions transmit data without requiring the page to refresh." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+												<p class="description"><?php _e( "AJAX form submissions transmit data without requiring the page to refresh.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 											</label></p>
 
 											<!-- Redirect User On Submission -->
 											<?php
-												if( !isset( $submission_settings['redirect_on_submission'] ) ) {
-													$submission_settings['redirect_on_submission'] = '0';
-													$submission_settings['redirect_page'] = '';
+												if ( ! isset( $submission_settings[ 'redirect_on_submission' ] ) ) {
+													$submission_settings[ 'redirect_on_submission' ] = '0';
+													$submission_settings[ 'redirect_page' ] = '';
 												}
 											?>
-											<p><label for="redirect-user-on-submission"><strong><?php _e( 'Redirect On Submission' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+											<p><label for="redirect-user-on-submission"><strong><?php _e( 'Redirect On Submission', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 												<span class="form-field-container-span">
-													<label for="redirect-user"><input type="radio" id="redirect-user" onclick="togglePageRedirection( this );" name="redirect-user-on-submission" value="1" <?php checked( $submission_settings['redirect_on_submission'] , '1' ); ?>><?php _e( 'Yes' , 'yikes-inc-easy-mailchimp-extender' ); ?></label>
-													&nbsp;<label for="do-not-redirect-user"><input type="radio" id="do-not-redirect-user" onclick="togglePageRedirection( this );" name="redirect-user-on-submission" value="0" <?php checked( $submission_settings['redirect_on_submission'] , '0' ); ?>><?php _e( 'No' , 'yikes-inc-easy-mailchimp-extender' ); ?></label>
+													<label for="redirect-user"><input type="radio" id="redirect-user" onclick="togglePageRedirection( this );" name="redirect-user-on-submission" value="1" <?php checked( $submission_settings[ 'redirect_on_submission' ], '1' ); ?>><?php _e( 'Yes', 'yikes-inc-easy-mailchimp-extender' ); ?></label>
+													&nbsp;<label for="do-not-redirect-user"><input type="radio" id="do-not-redirect-user" onclick="togglePageRedirection( this );" name="redirect-user-on-submission" value="0" <?php checked( $submission_settings[ 'redirect_on_submission' ], '0' ); ?>><?php _e( 'No', 'yikes-inc-easy-mailchimp-extender' ); ?></label>
 												</span>
-												<?php $this->generate_page_redirect_dropdown( $submission_settings['redirect_on_submission'] , $submission_settings['redirect_page'], ( isset( $submission_settings['custom_redirect_url'] ) ) ? esc_url( $submission_settings['custom_redirect_url'] ) : '' ); ?>
-												<p class="description"><?php _e( "When the user signs up would you like to redirect them to another page?" , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+												<?php $this->generate_page_redirect_dropdown( $submission_settings[ 'redirect_on_submission' ], $submission_settings[ 'redirect_page' ], ( isset( $submission_settings[ 'custom_redirect_url' ] ) ) ? esc_url( $submission_settings[ 'custom_redirect_url' ] ) : '' ); ?>
+												<p class="description"><?php _e( "When the user signs up would you like to redirect them to another page?", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 											</label></p>
 
 											<!-- Hide Form On Submission -->
 											<?php
-												if( !isset( $submission_settings['hide_form_post_signup'] ) ) {
-													$submission_settings['hide_form_post_signup'] = '0';
+												if ( ! isset( $submission_settings[ 'hide_form_post_signup' ] ) ) {
+													$submission_settings[ 'hide_form_post_signup' ] = '0';
 												}
 											?>
-											<p><label for="hide-form-post-signup"><strong><?php _e( 'Hide Form After Sign Up' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+											<p><label for="hide-form-post-signup"><strong><?php _e( 'Hide Form After Sign Up', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 												<span class="form-field-container-span">
-													<label for="hide-form"><input type="radio"  id="hide-form" name="hide-form-post-signup" value="1" <?php checked( $submission_settings['hide_form_post_signup'] , '1' ); ?> checked><?php _e( 'Yes' , 'yikes-inc-easy-mailchimp-extender' ); ?></label>
-													&nbsp;<label for="do-not-hide-form"><input type="radio" id="do-not-hide-form" name="hide-form-post-signup" value="0" <?php checked( $submission_settings['hide_form_post_signup'] , '0' ); ?>><?php _e( 'No' , 'yikes-inc-easy-mailchimp-extender' ); ?></label>
+													<label for="hide-form"><input type="radio"  id="hide-form" name="hide-form-post-signup" value="1" <?php checked( $submission_settings[ 'hide_form_post_signup' ], '1' ); ?> checked><?php _e( 'Yes', 'yikes-inc-easy-mailchimp-extender' ); ?></label>
+													&nbsp;<label for="do-not-hide-form"><input type="radio" id="do-not-hide-form" name="hide-form-post-signup" value="0" <?php checked( $submission_settings[ 'hide_form_post_signup' ], '0' ); ?>><?php _e( 'No', 'yikes-inc-easy-mailchimp-extender' ); ?></label>
 												</span>
-												<p class="description"><?php _e( "Should the form be hidden after the user successfully signs up?" , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+												<p class="description"><?php _e( "Should the form be hidden after the user successfully signs up?", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 											</label></p>
 
 											<!-- Append or Replace Interest Groups -->
 											<?php
-												if( !isset( $submission_settings['replace_interests'] ) ) {
-													$submission_settings['replace_interests'] = '1'; // defaults to true
+												if ( ! isset( $submission_settings[ 'replace_interests' ] ) ) {
+													$submission_settings[ 'replace_interests' ] = '1'; // defaults to true
 												}
 											?>
-											<p><label for="replace-interest-groups"><strong><?php _e( 'Existing Interest Groups' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+											<p><label for="replace-interest-groups"><strong><?php _e( 'Existing Interest Groups', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 												<span class="form-field-container-span">
-													<label for="replace-interest-groups"><input type="radio"  id="replace-interest-groups" name="replace-interest-groups" value="1" <?php checked( $submission_settings['replace_interests'] , '1' ); ?> checked><?php _e( 'Replace' , 'yikes-inc-easy-mailchimp-extender' ); ?></label>
-													&nbsp;<label for="update-interest-groups"><input type="radio" id="update-interest-groups" name="replace-interest-groups" value="0" <?php checked( $submission_settings['replace_interests'] , '0' ); ?>><?php _e( 'Update' , 'yikes-inc-easy-mailchimp-extender' ); ?></label>
+													<label for="replace-interest-groups"><input type="radio"  id="replace-interest-groups" name="replace-interest-groups" value="1" <?php checked( $submission_settings[ 'replace_interests' ], '1' ); ?> checked><?php _e( 'Replace', 'yikes-inc-easy-mailchimp-extender' ); ?></label>
+													&nbsp;<label for="update-interest-groups"><input type="radio" id="update-interest-groups" name="replace-interest-groups" value="0" <?php checked( $submission_settings[ 'replace_interests' ], '0' ); ?>><?php _e( 'Update', 'yikes-inc-easy-mailchimp-extender' ); ?></label>
 												</span>
 
-													<p class="description"><small><?php _e( "<strong>Replace</strong>: Replace all interest groups with the new ones submitted." , 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
+													<p class="description"><small><?php _e( "<strong>Replace</strong>: Replace all interest groups with the new ones submitted.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 
 
-													<p class="description"><small><?php _e( "<strong>Update</strong>: Update <em>only</em> the ones submitted. Leave existing interest groups as is." , 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
+													<p class="description"><small><?php _e( "<strong>Update</strong>: Update <em>only</em> the ones submitted. Leave existing interest groups as is.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 
 											</label></p>
 
@@ -856,9 +856,9 @@ 
 
 										<span class="form-buttons-container" id="major-publishing-actions">
 											<?php
-												echo submit_button( __( 'Update Form' ) , 'primary' , '' , false , array( 'onclick' => 'jQuery(this).parent().prev().css({"display":"block","visibility":"inherit"});' ) );
-												$url = esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-delete-form', 'mailchimp-form' => $form['id'] , 'nonce' => wp_create_nonce( 'delete-mailchimp-form-'.$form['id'] ) ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) );
-												echo '<a href="' . $url . '" class="yikes-delete-mailchimp-form" onclick="return confirm(\'' . __( "Are you sure you want to delete this form? This cannot be undone." , 'yikes-inc-easy-mailchimp-extender' ) . '\');">' . __( "Delete Form" , 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
+												echo submit_button( __( 'Update Form' ), 'primary', '', false, array( 'onclick' => 'jQuery(this).parent().prev().css({"display":"block","visibility":"inherit"});' ) );
+												$url = esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-delete-form', 'mailchimp-form' => $form[ 'id' ], 'nonce' => wp_create_nonce( 'delete-mailchimp-form-' . $form[ 'id' ] ) ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) );
+												echo '<a href="' . $url . '" class="yikes-delete-mailchimp-form" onclick="return confirm(\'' . __( "Are you sure you want to delete this form? This cannot be undone.", 'yikes-inc-easy-mailchimp-extender' ) . '\');">' . __( "Delete Form", 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
 											?>
 										</span>
 

admin/class-yikes-inc-easy-mailchimp-extender-admin.php

Spacing +556 added lines, -556 removed lines

@@ -38,19 +38,19 @@ 
 		$this->yikes_inc_easy_mailchimp_extender = $yikes_inc_easy_mailchimp_extender;
 		$this->version = $version;
 		// check for old plugin options and migrate if exist
-		add_action( 'admin_menu' , array( $this , 'register_admin_pages' ) , 11 );
+		add_action( 'admin_menu', array( $this, 'register_admin_pages' ), 11 );
 		// check for old plugin options and migrate if exist
-		add_action( 'admin_init' , array( $this , 'check_for_old_yks_mc_options' ) );
+		add_action( 'admin_init', array( $this, 'check_for_old_yks_mc_options' ) );
 		// Ajax function to update new options...
-		add_action( 'wp_ajax_migrate_old_plugin_settings', array( $this , 'migrate_archived_options' ) );
+		add_action( 'wp_ajax_migrate_old_plugin_settings', array( $this, 'migrate_archived_options' ) );
 		// Ajax function to migrate our forms
-		add_action( 'wp_ajax_migrate_prevoious_forms', array( $this , 'migrate_previously_setup_forms' ) );
+		add_action( 'wp_ajax_migrate_prevoious_forms', array( $this, 'migrate_previously_setup_forms' ) );
 		// fix menu icon spacing
-		add_action( 'admin_head' , array( $this , 'fix_menu_icon_spacing' ) );
+		add_action( 'admin_head', array( $this, 'fix_menu_icon_spacing' ) );
 		// register our plugin settings
-		add_action( 'admin_init', array( $this , 'yikes_easy_mc_settings_init' ) );
+		add_action( 'admin_init', array( $this, 'yikes_easy_mc_settings_init' ) );
 		// plugin redirect on activation
-		add_action( 'admin_init' , array( $this , 'yikes_easy_mc_activation_redirect' ) );
+		add_action( 'admin_init', array( $this, 'yikes_easy_mc_activation_redirect' ) );
 		// Include Third Party Extensions
 		include_once( YIKES_MC_PATH . 'includes/third-party-integrations/third-party-init.php' );
 		// Include our dashboard widget class
@@ -60,111 +60,111 @@ 
 		// Include our ajax processing class
 		include_once( YIKES_MC_PATH . 'admin/partials/ajax/class.ajax.php' );
 		// load up our helper class
-		add_action( 'admin_init' , array( $this , 'yikes_mailchimp_load_helper_class' ) );
+		add_action( 'admin_init', array( $this, 'yikes_mailchimp_load_helper_class' ) );
 		// process the subscriber count shortcode in form descriptions
 		add_action( 'yikes-mailchimp-form-description', array( $this, 'process_subscriber_count_shortcode_in_form_descriptions' ), 10, 2 );
 		/***********************/
 		/** Create A Form **/
 		/**********************/
 		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-create-form' ) {
-			add_action( 'init' , array( $this , 'yikes_easy_mailchimp_create_form' ) );
+			add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_form' ) );
 		}
 		/***********************/
 		/** Delete A Form **/
 		/**********************/
 		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-delete-form' ) {
-			add_action( 'init' , array( $this , 'yikes_easy_mailchimp_delete_form' ) );
+			add_action( 'init', array( $this, 'yikes_easy_mailchimp_delete_form' ) );
 		}
 		/**********************************/
 		/** Duplicate/Clone A Form 	**/
 		/********************************/
 		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-duplicate-form' ) {
-			add_action( 'init' , array( $this , 'yikes_easy_mailchimp_duplicate_form' ) );
+			add_action( 'init', array( $this, 'yikes_easy_mailchimp_duplicate_form' ) );
 		}
 		/*************************************/
 		/**  Reset Form Impression Stats **/
 		/***********************************/
 		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-reset-stats' ) {
-			add_action( 'init' , array( $this , 'yikes_easy_mailchimp_reset_impression_stats' ) );
+			add_action( 'init', array( $this, 'yikes_easy_mailchimp_reset_impression_stats' ) );
 		}
 		/**********************************/
 		/** 	     Update A Form 		**/
 		/********************************/
 		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-update-form' ) {
-			add_action( 'init' , array( $this , 'yikes_easy_mailchimp_update_form' ) );
+			add_action( 'init', array( $this, 'yikes_easy_mailchimp_update_form' ) );
 		}
 		/**************************************************/
 		/** 	 Clear Store MailChimp Transient Data   **/
 		/*************************************************/
 		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-clear-transient-data' ) {
-			add_action( 'init' , array( $this , 'yikes_easy_mailchimp_clear_transient_data' ) );
+			add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_transient_data' ) );
 		}
 		/*******************************************/
 		/** Remove a user from a mailing list 	 **/
 		/*****************************************/
 		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-unsubscribe-user' ) {
-			add_action( 'init' , array( $this , 'yikes_easy_mailchimp_unsubscribe_user' ) );
+			add_action( 'init', array( $this, 'yikes_easy_mailchimp_unsubscribe_user' ) );
 		}
 		/*******************************************/
 		/** 	Create misisng error log file  **/
 		/*****************************************/
 		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-create-error-log' ) {
-			add_action( 'init' , array( $this , 'yikes_easy_mailchimp_create_missing_error_log' ) );
+			add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_missing_error_log' ) );
 		}
 		/*******************************************/
 		/**   TinyMCE Initialization Functions	 **/
 		/*****************************************/
-		add_action( 'admin_head' , array( $this, 'add_tinyMCE_buttons' ) );
+		add_action( 'admin_head', array( $this, 'add_tinyMCE_buttons' ) );
 		// pass our lists data to tinyMCE button for use
-		foreach ( array('post.php','post-new.php') as $hook ) {
+		foreach ( array( 'post.php', 'post-new.php' ) as $hook ) {
 			add_action( "admin_head-$hook", array( $this, 'tinymce_yikes_easy_mc' ) );
 		}
 		// display an admin notice for users on PHP < 5.3
-		if( phpversion() < '5.3' ) {
+		if ( phpversion() < '5.3' ) {
 			add_action( "admin_notices", array( $this, 'display_php_warning' ), 999 );
 		}
 		// two week , dismissable notification - check the users plugin installation date
-		add_action( 'admin_init', array( $this , 'yikes_easy_mailchimp_check_installation_date' ) );
+		add_action( 'admin_init', array( $this, 'yikes_easy_mailchimp_check_installation_date' ) );
 		// dismissable notice admin side
-		add_action( 'admin_init', array( $this , 'yikes_easy_mailchimp_stop_bugging_me' ), 5 );
+		add_action( 'admin_init', array( $this, 'yikes_easy_mailchimp_stop_bugging_me' ), 5 );
 		/**************************************************/
 		/** 	 	Clear MailChimp Error Log Data 	    **/
 		/*************************************************/
 		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-clear-error-log' ) {
-			add_action( 'init' , array( $this , 'yikes_easy_mailchimp_clear_error_log' ) );
+			add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_error_log' ) );
 		}
 		/*********************************************/
 		/** 		Export MailChimp Opt-in Forms   **/
 		/*******************************************/
 		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-export-forms' ) {
-			add_action( 'init' , array( $this , 'yikes_easy_mailchimp_export_forms' ) );
+			add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_forms' ) );
 		}
 		/*********************************************/
 		/** 				Export Plugin Settings    	   **/
 		/*******************************************/
 		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-export-settings' ) {
-			add_action( 'init' , array( $this , 'yikes_easy_mailchimp_export_plugin_settings' ) );
+			add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_plugin_settings' ) );
 		}
 		/*******************************************/
 		/** 		Import Class Inclusion	   **/
 		/*****************************************/
 		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-import-forms' ) {
-			add_action( 'init' , array( $this , 'yikes_easy_mailchimp_import_forms' ) );
+			add_action( 'init', array( $this, 'yikes_easy_mailchimp_import_forms' ) );
 		}
 		/*******************************************/
 		/** 	Premium Support Request     **/
 		/*****************************************/
 		if ( isset( $_POST[ 'submit-premium-support-request' ] ) ) {
-			add_action( 'init' , array( $this , 'yikes_easy_mailchimp_premium_support_request' ) );
+			add_action( 'init', array( $this, 'yikes_easy_mailchimp_premium_support_request' ) );
 		}
 		/****************************************/
 		/**	Dismiss Options Migrations		**/
 		/****************************************/
-		if( isset( $_REQUEST['dismiss_migration_nonce'] ) ) {
-			add_action( 'init' , array( $this , 'yikes_easy_mailchimp_dismiss_option_migrate' ) );
+		if ( isset( $_REQUEST[ 'dismiss_migration_nonce' ] ) ) {
+			add_action( 'init', array( $this, 'yikes_easy_mailchimp_dismiss_option_migrate' ) );
 		}
 		/** Parse default value into usable dynamic data **/
-		add_filter( 'yikes-mailchimp-process-default-tag' , array( $this , 'parse_mailchimp_default_tag' ) );
+		add_filter( 'yikes-mailchimp-process-default-tag', array( $this, 'parse_mailchimp_default_tag' ) );
 		/** Add a disclaimer to ensure that we let people know we are not endorsed/backed by MailChimp at all **/
 		add_filter( 'admin_footer_text', array( $this, 'yikes_easy_forms_admin_disclaimer' ) );
 		/** Add custom plugin action links **/
@@ -184,8 +184,8 @@ 
 		*	@ return	array	$links		New array of plugin actions
 		*/
 		public function easy_forms_plugin_action_links( $links ) {
-		   $links[] = '<a href="'. esc_url( get_admin_url(null, 'admin.php?page=yikes-inc-easy-mailchimp-settings') ) .'">' . __( 'Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
-		   $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' , 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
+		   $links[ ] = '<a href="' . esc_url( get_admin_url( null, 'admin.php?page=yikes-inc-easy-mailchimp-settings' ) ) . '">' . __( 'Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
+		   $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', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
 		   return $links;
 		}
 
@@ -218,29 +218,29 @@ 
 		*	@return	parsed tag content
 		*/
 		public function parse_mailchimp_default_tag( $default_tag ) {
-			if( ! $default_tag || $default_tag == '' ) {
+			if ( ! $default_tag || $default_tag == '' ) {
 				return $default_tag;
 			}
 			global $post;
 			// page title
-			if( $default_tag == '{page_title}' ) {
+			if ( $default_tag == '{page_title}' ) {
 				$default_tag = get_the_title( $post->ID );
 			}
 			// page id
-			if( $default_tag == '{page_title}' ) {
+			if ( $default_tag == '{page_title}' ) {
 				$default_tag = $post->ID;
 			}
 			// page url
-			if( $default_tag == '{page_url}' ) {
+			if ( $default_tag == '{page_url}' ) {
 				$default_tag = get_permalink( $post->ID );
 			}
 			// blog name
-			if( $default_tag == '{blog_name}' ) {
+			if ( $default_tag == '{blog_name}' ) {
 				$default_tag = get_bloginfo( 'name' );
 			}
 			// is user logged in
-			if( $default_tag == '{user_logged_in}' ) {
-				if( is_user_logged_in() ) {
+			if ( $default_tag == '{user_logged_in}' ) {
+				if ( is_user_logged_in() ) {
 					$default_tag = 'Registered User';
 				} else {
 					$default_tag = 'Guest User';
@@ -258,12 +258,12 @@ 
 		*/
 		public function yikes_easy_mailchimp_clear_error_log() {
 			// file put contents $returned error + other data
-			if( file_exists( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php' ) ) {
+			if ( file_exists( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php' ) ) {
 				$clear_log = file_put_contents(
 					YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php',
 					''
 				);
-				if( $clear_log === false ) {
+				if ( $clear_log === false ) {
 					// redirect the user to the manage forms page, display error message
 					wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error-log-cleared=false' ) ) );
 				} else {
@@ -281,20 +281,20 @@ 
 		*/
 		public function yikes_easy_mailchimp_export_forms() {
 			// grab our nonce
-			$nonce = $_REQUEST['nonce'];
+			$nonce = $_REQUEST[ 'nonce' ];
 			// grab the forms
-			$forms = isset( $_REQUEST['export_forms'] ) ? $_REQUEST['export_forms'] : 'all';
+			$forms = isset( $_REQUEST[ 'export_forms' ] ) ? $_REQUEST[ 'export_forms' ] : 'all';
 			// validate nonce
-			if( ! wp_verify_nonce( $nonce, 'export-forms' ) ) {
-				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 ) );
+			if ( ! wp_verify_nonce( $nonce, 'export-forms' ) ) {
+				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 ) );
 			}
 			// include the export class
-			if( ! class_exists( 'Yikes_Inc_Easy_MailChimp_Export_Class' ) ) {
+			if ( ! class_exists( 'Yikes_Inc_Easy_MailChimp_Export_Class' ) ) {
 				include_once( YIKES_MC_PATH . 'includes/import-export/yikes-easy-mailchimp-export.class.php' );
 			}
 			// run the export function
 			// parameters: ( $table_name, $form_ids, $file_name )
-			Yikes_Inc_Easy_MailChimp_Export_Class::yikes_mailchimp_form_export( 'yikes_easy_mc_forms' , $forms, 'Yikes-Inc-Easy-MailChimp-Forms-Export' );
+			Yikes_Inc_Easy_MailChimp_Export_Class::yikes_mailchimp_form_export( 'yikes_easy_mc_forms', $forms, 'Yikes-Inc-Easy-MailChimp-Forms-Export' );
 			// re-direct the user back to the page
 			wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=import-export-forms' ) ) );
 			die();
@@ -308,13 +308,13 @@ 
 		*/
 		public function yikes_easy_mailchimp_export_plugin_settings() {
 			// grab our nonce
-			$nonce = $_REQUEST['nonce'];
+			$nonce = $_REQUEST[ 'nonce' ];
 			// validate nonce
-			if( ! wp_verify_nonce( $nonce, 'export-settings' ) ) {
-				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 ) );
+			if ( ! wp_verify_nonce( $nonce, 'export-settings' ) ) {
+				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 ) );
 			}
 			// include the export class
-			if( ! class_exists( 'Yikes_Inc_Easy_MailChimp_Export_Class' ) ) {
+			if ( ! class_exists( 'Yikes_Inc_Easy_MailChimp_Export_Class' ) ) {
 				include_once( YIKES_MC_PATH . 'includes/import-export/yikes-easy-mailchimp-export.class.php' );
 			}
 			// run the export function
@@ -331,13 +331,13 @@ 
 		*/
 		public function yikes_easy_mailchimp_import_forms() {
 			// grab our nonce
-			$nonce = $_REQUEST['nonce'];
+			$nonce = $_REQUEST[ 'nonce' ];
 			// validate nonce
-			if( ! wp_verify_nonce( $nonce, 'import-forms' ) ) {
-				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 ) );
+			if ( ! wp_verify_nonce( $nonce, 'import-forms' ) ) {
+				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 ) );
 			}
 			// include the export class
-			if( ! class_exists( 'Yikes_Inc_Easy_MailChimp_Import_Class' ) ) {
+			if ( ! class_exists( 'Yikes_Inc_Easy_MailChimp_Import_Class' ) ) {
 				include_once( YIKES_MC_PATH . 'includes/import-export/yikes-easy-mailchimp-import.class.php' );
 			}
 			// run the import function
@@ -355,15 +355,15 @@ 
 		*/
 		public function yikes_easy_mailchimp_premium_support_request() {
 
-			if( isset( $_POST['action'] ) && $_POST['action'] != 'yikes-support-request' ) {
-				return __( 'We encountered an error. Please contact the YIKES Inc. support team.' , 'yikes-inc-easy-mailchimp-extender' );
+			if ( isset( $_POST[ 'action' ] ) && $_POST[ 'action' ] != 'yikes-support-request' ) {
+				return __( 'We encountered an error. Please contact the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' );
 			}
 
-			$license = $_POST['license_key'];
-			$user_email = $_POST['user-email'];
-			$support_topic = $_POST['support-topic'];
-			$support_priority = $_POST['support-priority'];
-			$support_content = $_POST['support-content'];
+			$license = $_POST[ 'license_key' ];
+			$user_email = $_POST[ 'user-email' ];
+			$support_topic = $_POST[ 'support-topic' ];
+			$support_priority = $_POST[ 'support-priority' ];
+			$support_content = $_POST[ 'support-content' ];
 
 			// wp_die( print_r( $support_content) );
 
@@ -379,18 +379,18 @@ 
 
 			$yikes_plugin_support_url = 'https://yikesplugins.com';
 
-			if( $license != 'plugin-core' ) {
+			if ( $license != 'plugin-core' ) {
 				$split_license = explode( '|', $license );
 				// first let's check that the license key is actually active
 				$is_license_key_active = wp_remote_post( esc_url( $yikes_plugin_support_url ), array(
 					'action' => 'check_license',
-					'product_name' => urlencode( str_replace( '-', '', $split_license[1] ) . 'for Easy MailChimp' ),
-					'license' => $split_license[0],
+					'product_name' => urlencode( str_replace( '-', '', $split_license[ 1 ] ) . 'for Easy MailChimp' ),
+					'license' => $split_license[ 0 ],
 				) );
 
-				$response_body =  wp_remote_retrieve_body( $is_license_key_active );
-				if( $response_body ) {
-					if( $response_body->status != 'valid' ) {
+				$response_body = wp_remote_retrieve_body( $is_license_key_active );
+				if ( $response_body ) {
+					if ( $response_body->status != 'valid' ) {
 						wp_die( 'Invalid License Key...' );
 					}
 				}
@@ -404,7 +404,7 @@ 
 			) );
 
 			// catch the error
-			if( is_wp_error( $response ) ) {
+			if ( is_wp_error( $response ) ) {
 				wp_die( $create_ticket_request->getMessage() );
 				return;
 			}
@@ -413,7 +413,7 @@ 
 			$create_ticket_response = wp_remote_retrieve_body( $response );
 
 			// display it
-			if( $create_ticket_response )
+			if ( $create_ticket_response )
 				echo $create_ticket_response;
 
 		}
@@ -427,7 +427,7 @@ 
 			// delete the options and allow the user to manually updadte things
 
 			// Verify the NONCE is valid
-			check_admin_referer( 'yikes-mc-dismiss-migration' , 'dismiss_migration_nonce' );
+			check_admin_referer( 'yikes-mc-dismiss-migration', 'dismiss_migration_nonce' );
 
 			// re-direct the user back to the page
 			wp_redirect( esc_url_raw( admin_url( 'index.php?yikes-mc-options-migration-dismissed="true"' ) ) );
@@ -442,7 +442,7 @@ 
 		 * @since 6.0.0
 		 */
 		public function load_error_logging_class() {
-			if( get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+			if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 				// if error logging is enabled we should include our error logging class
 				/* Generate oure error logging table */
 				require_once YIKES_MC_PATH . '/includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
@@ -461,17 +461,17 @@ 
 			// add a new option to store the plugin activation date/time
 			// @since v6.0.0
 			// this is used to notify the user that they should review after 2 weeks
-			if ( !get_option( 'yikes_easy_mailchimp_activation_date' ) ) {
+			if ( ! get_option( 'yikes_easy_mailchimp_activation_date' ) ) {
 				add_option( 'yikes_easy_mailchimp_activation_date', strtotime( "now" ) );
 			}
 
 			$stop_bugging_me = get_option( 'yikes_easy_mailchimp_review_stop_bugging_me' );
 
-			if( !$stop_bugging_me ) {
+			if ( ! $stop_bugging_me ) {
 				$install_date = get_option( 'yikes_easy_mailchimp_activation_date' );
 				$past_date = strtotime( '-14 days' );
 				if ( $past_date >= $install_date && current_user_can( 'install_plugins' ) ) {
-					add_action( 'admin_notices', array( $this , 'yikes_easy_mailchimp_display_review_us_notice' ) );
+					add_action( 'admin_notices', array( $this, 'yikes_easy_mailchimp_display_review_us_notice' ) );
 				}
 			}
 
@@ -484,13 +484,13 @@ 
 		*/
 		public function yikes_easy_mailchimp_display_review_us_notice() {
 			/* Lets only display our admin notice on YT4WP pages to not annoy the hell out of people :) */
-			if ( in_array( get_current_screen()->base , array( 'dashboard' , 'post' , 'edit' ) ) || strpos( get_current_screen()->base ,'yikes-inc-easy-mailchimp') !== false ) {
+			if ( in_array( get_current_screen()->base, array( 'dashboard', 'post', 'edit' ) ) || strpos( get_current_screen()->base, 'yikes-inc-easy-mailchimp' ) !== false ) {
 				// Review URL - Change to the URL of your plugin on WordPress.org
 				$reviewurl = 'https://wordpress.org/support/view/plugin-reviews/yikes-inc-easy-mailchimp-extender';
 				$addons_url = esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-addons' ) );
 				$nobugurl = esc_url_raw( add_query_arg( 'yikes_easy_mc_icons_nobug', '1', admin_url() ) );
 				$review_message = '<div id="yikes-mailchimp-logo"></div>';
-				$review_message .= sprintf( __( "It looks like you've been using %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' ) . "<span class='button-container'> <a href='%s' target='_blank' class='button-secondary'><span class='dashicons dashicons-star-filled'></span>" . __( "Leave A Review" , 'yikes-inc-easy-mailchimp-extender' ) . "</a> <a href='%s' class='button-secondary'><span class='dashicons dashicons-upload'></span>" . __( "View Addons" , 'yikes-inc-easy-mailchimp-extender' ) . "</a> <a href='%s' class='button-secondary'><span class='dashicons dashicons-no-alt'></span>" . __( "Dismiss" , 'yikes-inc-easy-mailchimp-extender' ) . "</a> </span>", '<strong>Easy Forms for MailChimp by YIKES Inc.</strong>', $reviewurl, $addons_url, $nobugurl ) . '';
+				$review_message .= sprintf( __( "It looks like you've been using %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' ) . "<span class='button-container'> <a href='%s' target='_blank' class='button-secondary'><span class='dashicons dashicons-star-filled'></span>" . __( "Leave A Review", 'yikes-inc-easy-mailchimp-extender' ) . "</a> <a href='%s' class='button-secondary'><span class='dashicons dashicons-upload'></span>" . __( "View Addons", 'yikes-inc-easy-mailchimp-extender' ) . "</a> <a href='%s' class='button-secondary'><span class='dashicons dashicons-no-alt'></span>" . __( "Dismiss", 'yikes-inc-easy-mailchimp-extender' ) . "</a> </span>", '<strong>Easy Forms for MailChimp by YIKES Inc.</strong>', $reviewurl, $addons_url, $nobugurl ) . '';
 				?>
 					<div id="review-yikes-easy-mailchimp-notice">
 						<?php echo $review_message; ?>
@@ -506,8 +506,8 @@ 
 		*/
 		public function yikes_easy_mailchimp_stop_bugging_me() {
 			$nobug = "";
-			if ( isset( $_GET['yikes_easy_mc_icons_nobug'] ) ) {
-				$nobug = (int) esc_attr( $_GET['yikes_easy_mc_icons_nobug'] );
+			if ( isset( $_GET[ 'yikes_easy_mc_icons_nobug' ] ) ) {
+				$nobug = (int) esc_attr( $_GET[ 'yikes_easy_mc_icons_nobug' ] );
 			}
 			if ( 1 == $nobug ) {
 				add_option( 'yikes_easy_mailchimp_review_stop_bugging_me', TRUE );
@@ -518,7 +518,7 @@ 
 
 		/* Display a warning users who are using PHP < 5.3 */
 		public function display_php_warning() {
-			$message = __( 'YIKES Inc. Easy Forms for MailChimp requires a minimum of PHP 5.3. The plugin will not function properly until you update. Reach out to your host provider for assistance.' , 'yikes-inc-easy-mailchimp-extender' );
+			$message = __( 'YIKES Inc. Easy Forms for MailChimp requires a minimum of PHP 5.3. The plugin will not function properly until you update. Reach out to your host provider for assistance.', 'yikes-inc-easy-mailchimp-extender' );
 			echo "<div class='error'> <p><span class='dashicons dashicons-no-alt' style='color:rgb(231, 98, 98)'></span> $message</p></div>";
 		}
 
@@ -529,7 +529,7 @@ 
 		public function add_tinyMCE_buttons() {
 			global $typenow;
 			// only on Post Type: post and page
-			if( ! in_array( $typenow, array( 'post', 'page' ) ) ) {
+			if ( ! in_array( $typenow, array( 'post', 'page' ) ) ) {
 				return;
 			}
 			add_filter( 'mce_buttons', array( $this, 'yks_mc_add_tinymce_button' ) );
@@ -545,7 +545,7 @@ 
 
 		// inlcude the js for tinymce
 		public function yks_mc_add_tinymce_plugin( $plugin_array ) {
-			$plugin_array['yks_mc_tinymce_button'] = plugins_url( '/js/min/yikes-inc-easy-mailchimp-tinymce-button.min.js', __FILE__ );
+			$plugin_array[ 'yks_mc_tinymce_button' ] = plugins_url( '/js/min/yikes-inc-easy-mailchimp-tinymce-button.min.js', __FILE__ );
 			// Print all plugin js path
 			// var_dump( $plugin_array );
 			return $plugin_array;
@@ -558,25 +558,25 @@ 
 		*/
 		public function tinymce_yikes_easy_mc() {
 			// check capabilities
-			if( ! current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) {
+			if ( ! current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) {
 				return;
 			}
 			global $wpdb;
 			$list_data = $wpdb->get_results( 'SELECT * FROM ' . $wpdb->prefix . 'yikes_easy_mc_forms', ARRAY_A );
 			$lists = array();
 			$i = 0;
-			if( !empty( $list_data ) ) {
+			if ( ! empty( $list_data ) ) {
 				// build an array to pass to our javascript
-				foreach( $list_data as $form ) {
-						$lists[$i] = array(
-							'text' => urlencode( $form['form_name'] ),
-							'value' => $form['id']
+				foreach ( $list_data as $form ) {
+						$lists[ $i ] = array(
+							'text' => urlencode( $form[ 'form_name' ] ),
+							'value' => $form[ 'id' ]
 						);
 						$i++;
 				}
 			} else {
-				$lists[0] = array(
-					'text' => __( 'Please Import Some MailChimp Lists' , 'yikes-inc-easy-mailchimp-extender' ),
+				$lists[ 0 ] = array(
+					'text' => __( 'Please Import Some MailChimp Lists', 'yikes-inc-easy-mailchimp-extender' ),
 					'value' => '-'
 				);
 			}
@@ -589,10 +589,10 @@ 
 				var localized_data = {
 					'button_title' : '<?php _e( 'Easy Forms for MailChimp by YIKES', 'yikes-inc-easy-mailchimp-extender' ); ?>',
 					'popup_title' : '<?php _e( 'Easy Forms for MailChimp by YIKES', 'yikes-inc-easy-mailchimp-extender' ); ?>',
-					'list_id_label' : '<?php _e( 'MailChimp Opt-In Form' , 'yikes-inc-easy-mailchimp-extender' ); ?>',
-					'show_title_label' : '<?php _e( 'Display Form Title' , 'yikes-inc-easy-mailchimp-extender' ); ?>',
-					'show_description_label' : '<?php _e( 'Display Form Description' , 'yikes-inc-easy-mailchimp-extender' ); ?>',
-					'submit_button_text_label' : '<?php _e( 'Submit Button Text' , 'yikes-inc-easy-mailchimp-extender' ); ?>',
+					'list_id_label' : '<?php _e( 'MailChimp Opt-In Form', 'yikes-inc-easy-mailchimp-extender' ); ?>',
+					'show_title_label' : '<?php _e( 'Display Form Title', 'yikes-inc-easy-mailchimp-extender' ); ?>',
+					'show_description_label' : '<?php _e( 'Display Form Description', 'yikes-inc-easy-mailchimp-extender' ); ?>',
+					'submit_button_text_label' : '<?php _e( 'Submit Button Text', 'yikes-inc-easy-mailchimp-extender' ); ?>',
 				};
 				<?php
 					$link = sprintf( __( 'You need to <a href="%s" title="%s">create a form</a> before you can add one to a page or post.', 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ), __( 'Create a form', 'yikes-inc-easy-mailchimp-extender' ) );
@@ -611,7 +611,7 @@ 
 		if ( get_option( 'yikes_mailchimp_activation_redirect', 'true' ) == 'true' ) {
 			update_option( 'yikes_mailchimp_activation_redirect', 'false' );
 			/* If the user had this plugin activated prior to today, redirect to 'Whats New' */
-			if( get_option( 'yikes_easy_mailchimp_activation_date', strtotime( 'now' ) ) == strtotime( 'now' ) ) {
+			if ( get_option( 'yikes_easy_mailchimp_activation_date', strtotime( 'now' ) ) == strtotime( 'now' ) ) {
 				wp_redirect( esc_url( admin_url( 'admin.php?page=yikes-mailchimp-welcome' ) ) );
 			} else {
 				/* Else redirect the user over to the 'Getting Started' tab */
@@ -667,7 +667,7 @@ 
 		/**
 		 * Enqueue our scripts across the dashboard as needed
 		 */
-		wp_register_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 );
+		wp_register_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 );
 		$localized_data = array(
 			'admin_url' => esc_url_raw( admin_url() ),
 			'ajax_url' => esc_url_raw( admin_url( 'admin-ajax.php' ) ),
@@ -675,19 +675,19 @@ 
 			'search_preloader_url' => YIKES_MC_URL . 'includes/images/search-interest-group-preloader.gif',
 			'preloader_url' => esc_url_raw( admin_url( '/images/wpspin_light.gif' ) )
 		);
-		wp_localize_script( 'yikes-inc-easy-mailchimp-extender-admin-js' , 'object_data' , $localized_data );
+		wp_localize_script( 'yikes-inc-easy-mailchimp-extender-admin-js', 'object_data', $localized_data );
 		wp_enqueue_script( 'yikes-inc-easy-mailchimp-extender-admin-js' );
 
 
 		/*
 		*	Enqueue required scripts for the form editor
 		*/
-		if( get_current_screen()->base == 'admin_page_yikes-mailchimp-edit-form' ) {
+		if ( get_current_screen()->base == 'admin_page_yikes-mailchimp-edit-form' ) {
 			global $wp_locale;
 			wp_enqueue_style( 'wp-color-picker' );
 			wp_enqueue_script( 'wp-color-picker' );
-			wp_enqueue_script( 'jquery.timepicker.js',YIKES_MC_URL . 'admin/js/jquery.timepicker.min.js' , array( 'jquery' ) , $this->version, false );
-			wp_register_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 );
+			wp_enqueue_script( 'jquery.timepicker.js', YIKES_MC_URL . 'admin/js/jquery.timepicker.min.js', array( 'jquery' ), $this->version, false );
+			wp_register_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 );
 			$localized_data = array(
 				'ajax_url' => esc_url_raw( admin_url( 'admin-ajax.php' ) ),
 				'no_fields_assigned' => __( 'No fields assigned to this form. Select some fields to add to this form from the right hand column.', 'yikes-inc-easy-mailchimp-extender' ),
@@ -708,7 +708,7 @@ 
 				'isRTL'             => $wp_locale->is_rtl(),
 				'start_date_exceeds_end_date_error' => __( 'Error: The start date and time cannot occur after the end date and time. Chosen date reverted to previous selection.', 'yikes-inc-easy-mailchimp-extender' ),
 			);
-			wp_localize_script( 'edit-form-js' , 'object' , $localized_data );
+			wp_localize_script( 'edit-form-js', 'object', $localized_data );
 			wp_enqueue_script( 'edit-form-js' );
 		}
 
@@ -728,8 +728,8 @@ 
 		 * the datepicker wants a numerical index. This function replaces the index with a number
 		 */
 		public function yikes_jQuery_datepicker_strip_array_indices( $ArrayToStrip ) {
-			foreach( $ArrayToStrip as $objArrayItem) {
-				$NewArray[] =  $objArrayItem;
+			foreach ( $ArrayToStrip as $objArrayItem ) {
+				$NewArray[ ] = $objArrayItem;
 			}
 			return( $NewArray );
 		}
@@ -738,7 +738,7 @@ 
 		 * Convert the php date format string to a js date format
 		 */
 		public function yikes_jQuery_datepicker_date_format_php_to_js( $sFormat ) {
-			switch( $sFormat ) {
+			switch ( $sFormat ) {
 				//Predefined WP date formats
 				case 'F j, Y':
 				case 'j F Y':
@@ -764,7 +764,7 @@ 
 		 * Convert the php date format string to a js date format
 		 */
 		public function yikes_jQuery_datepicker_date_format( $site_option ) {
-			switch( $site_option ) {
+			switch ( $site_option ) {
 				//Predefined WP date formats
 				default:
 				case 'F j, Y':
@@ -791,9 +791,9 @@ 
 
 		/* Top Level Menu 'Easy MailChimp' */
 		add_menu_page(
-			__( 'Easy Forms' , 'yikes-inc-easy-mailchimp-extender' ),
+			__( 'Easy Forms', 'yikes-inc-easy-mailchimp-extender' ),
 			'Easy Forms',
-			apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ),
+			apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ),
 			'yikes-inc-easy-mailchimp',
 			'', // no callback,
 			YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_wink_icon.png'
@@ -807,9 +807,9 @@ 
 				/* YIKES Inc. Easy MailChimp Manage Forms */
 				add_submenu_page(
 					'yikes-inc-easy-mailchimp',
-					__( 'Opt-in Forms' , 'yikes-inc-easy-mailchimp-extender' ),
-					__( 'Opt-in Forms' , 'yikes-inc-easy-mailchimp-extender' ),
-					apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ),
+					__( 'Opt-in Forms', 'yikes-inc-easy-mailchimp-extender' ),
+					__( 'Opt-in Forms', 'yikes-inc-easy-mailchimp-extender' ),
+					apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ),
 					'yikes-inc-easy-mailchimp',
 					array( $this, 'generateManageFormsPage' )
 				);
@@ -817,9 +817,9 @@ 
 				/* YIKES Inc. Easy MailChimp Manage Lists */
 				add_submenu_page(
 					'yikes-inc-easy-mailchimp',
-					__( 'Mailing Lists' , 'yikes-inc-easy-mailchimp-extender' ),
-					__( 'Mailing Lists' , 'yikes-inc-easy-mailchimp-extender' ),
-					apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ),
+					__( 'Mailing Lists', 'yikes-inc-easy-mailchimp-extender' ),
+					__( 'Mailing Lists', 'yikes-inc-easy-mailchimp-extender' ),
+					apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ),
 					'yikes-inc-easy-mailchimp-lists',
 					array( $this, 'generateManageListsPage' )
 				);
@@ -833,13 +833,13 @@ 
 
 
 			/* YIKES Inc. Easy MailChimp Account Overview */
-			if ( get_option('yikes-mc-api-validation') == 'valid_api_key' ) {
+			if ( get_option( 'yikes-mc-api-validation' ) == 'valid_api_key' ) {
 				/* YIKES Inc. Easy MailChimp Settings */
 				add_submenu_page(
 					'yikes-inc-easy-mailchimp',
-					__( 'Account' , 'yikes-inc-easy-mailchimp-extender' ),
-					__( 'Account' , 'yikes-inc-easy-mailchimp-extender' ),
-					apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ),
+					__( 'Account', 'yikes-inc-easy-mailchimp-extender' ),
+					__( 'Account', 'yikes-inc-easy-mailchimp-extender' ),
+					apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ),
 					'yikes-inc-easy-mailchimp-account-overview',
 					array( $this, 'generateAccountDetailsPage' )
 				);
@@ -849,9 +849,9 @@ 
 			/* YIKES Inc. Easy MailChimp Settings */
 			add_submenu_page(
 				'yikes-inc-easy-mailchimp',
-				__( 'Settings.' , 'yikes-inc-easy-mailchimp-extender' ),
-				__( 'Settings' , 'yikes-inc-easy-mailchimp-extender' ),
-				apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ),
+				__( 'Settings.', 'yikes-inc-easy-mailchimp-extender' ),
+				__( 'Settings', 'yikes-inc-easy-mailchimp-extender' ),
+				apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ),
 				'yikes-inc-easy-mailchimp-settings',
 				array( $this, 'generatePageOptions' )
 			);
@@ -859,9 +859,9 @@ 
 			/* Support Page */
 			add_submenu_page(
 				'yikes-inc-easy-mailchimp',
-				__( 'Support' , 'yikes-inc-easy-mailchimp-extender' ),
-				__( 'Support' , 'yikes-inc-easy-mailchimp-extender' ),
-				apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ),
+				__( 'Support', 'yikes-inc-easy-mailchimp-extender' ),
+				__( 'Support', 'yikes-inc-easy-mailchimp-extender' ),
+				apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ),
 				'yikes-inc-easy-mailchimp-support',
 				array( $this, 'generateSupportPage' )
 			);
@@ -869,11 +869,11 @@ 
 			/* Add-Ons Page */
 			add_submenu_page(
 				'yikes-inc-easy-mailchimp',
-				__( 'Add-Ons' , 'yikes-inc-easy-mailchimp-extender' ),
-				__( 'Add-Ons' , 'yikes-inc-easy-mailchimp-extender' ),
-				apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ),
+				__( 'Add-Ons', 'yikes-inc-easy-mailchimp-extender' ),
+				__( 'Add-Ons', 'yikes-inc-easy-mailchimp-extender' ),
+				apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ),
 				'yikes-inc-easy-mailchimp-addons',
-				array( $this , 'generateAddOnsPage' )
+				array( $this, 'generateAddOnsPage' )
 			);
 
 			/** Hidden Pages **/
@@ -881,9 +881,9 @@ 
 				/* Add Hidden Edit Form Page */
 				add_submenu_page(
 					'options.php',
-					__( 'Edit Form' , 'yikes-inc-easy-mailchimp-extender' ),
-					__( 'Edit Form' , 'yikes-inc-easy-mailchimp-extender' ),
-					apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ),
+					__( 'Edit Form', 'yikes-inc-easy-mailchimp-extender' ),
+					__( 'Edit Form', 'yikes-inc-easy-mailchimp-extender' ),
+					apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ),
 					'yikes-mailchimp-edit-form',
 					array( $this, 'generateEditFormPage' )
 				);
@@ -891,19 +891,19 @@ 
 				/* Add Hidden Migrate Options Page */
 				add_submenu_page(
 					'options-writing.php',
-					__( 'YIKES Inc. Easy Forms for MailChimp Upgrade Options Structure' , 'yikes-inc-easy-mailchimp-extender' ),
+					__( 'YIKES Inc. Easy Forms for MailChimp Upgrade Options Structure', 'yikes-inc-easy-mailchimp-extender' ),
 					'YIKES Inc. Easy Forms for MailChimp Upgrade Options Structure',
 					'manage_options',
-					'yikes-inc-easy-mailchimp-update' ,
-					array( $this , 'migrate_old_yks_mc_options' )
+					'yikes-inc-easy-mailchimp-update',
+					array( $this, 'migrate_old_yks_mc_options' )
 				);
 
 				/* Add Hidden Welcome Page */
 				add_submenu_page(
 					'options.php',
-					__( 'Welcome' , 'yikes-inc-easy-mailchimp-extender' ),
-					__( 'Welcome' , 'yikes-inc-easy-mailchimp-extender' ),
-					apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ),
+					__( 'Welcome', 'yikes-inc-easy-mailchimp-extender' ),
+					__( 'Welcome', 'yikes-inc-easy-mailchimp-extender' ),
+					apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ),
 					'yikes-mailchimp-welcome',
 					array( $this, 'generateWelcomePage' )
 				);
@@ -911,9 +911,9 @@ 
 				/* Add Hidden 'View List' Page */
 				add_submenu_page(
 					'options.php',
-					__( 'View List' , 'yikes-inc-easy-mailchimp-extender' ),
-					__( 'View List' , 'yikes-inc-easy-mailchimp-extender' ),
-					apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ),
+					__( 'View List', 'yikes-inc-easy-mailchimp-extender' ),
+					__( 'View List', 'yikes-inc-easy-mailchimp-extender' ),
+					apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ),
 					'yikes-mailchimp-view-list',
 					array( $this, 'generateViewListPage' )
 				);
@@ -921,9 +921,9 @@ 
 				/* Add Hidden View User Page */
 				add_submenu_page(
 					'options.php',
-					__( 'View User' , 'yikes-inc-easy-mailchimp-extender' ),
-					__( 'View User' , 'yikes-inc-easy-mailchimp-extender' ),
-					apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ),
+					__( 'View User', 'yikes-inc-easy-mailchimp-extender' ),
+					__( 'View User', 'yikes-inc-easy-mailchimp-extender' ),
+					apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ),
 					'yikes-mailchimp-view-user',
 					array( $this, 'generateViewUserPage' )
 				);
@@ -1020,7 +1020,7 @@ 
 
 		/* Register General Settings Section */
 
-		register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mc-api-key', array( $this , 'yikes_mc_validate_api_key' ) );
+		register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mc-api-key', array( $this, 'yikes_mc_validate_api_key' ) );
 
 		add_settings_section(
 			'yikes_easy_mc_settings_general_section_callback',
@@ -1063,16 +1063,16 @@ 
 		add_settings_field(
 			'optin-checkbox-init',
 			__( 'Select Checkboxes to Generate', 'yikes-inc-easy-mailchimp-extender' ),
-			'',  // callback + validation inside of admin/partials/menu/options.php
+			'', // callback + validation inside of admin/partials/menu/options.php
 			'yikes_inc_easy_mc_checkbox_settings'
 		);
 		/* End Checkbox Settings */
 
 		/* reCAPTCHA Settings */
 
-			register_setting( 'yikes_inc_easy_mc_recaptcha_settings_page' , 'yikes-mc-recaptcha-status' );
-			register_setting( 'yikes_inc_easy_mc_recaptcha_settings_page' , 'yikes-mc-recaptcha-site-key' );
-			register_setting( 'yikes_inc_easy_mc_recaptcha_settings_page' , 'yikes-mc-recaptcha-secret-key' );
+			register_setting( 'yikes_inc_easy_mc_recaptcha_settings_page', 'yikes-mc-recaptcha-status' );
+			register_setting( 'yikes_inc_easy_mc_recaptcha_settings_page', 'yikes-mc-recaptcha-site-key' );
+			register_setting( 'yikes_inc_easy_mc_recaptcha_settings_page', 'yikes-mc-recaptcha-secret-key' );
 
 			/* Register reCAPTCHA Settings Section */
 			add_settings_section(
@@ -1085,28 +1085,28 @@ 
 			add_settings_field(
 				'yikes-mc-recaptcha-site-key',
 				__( 'Enter reCAPTCHA Site Key', 'yikes-inc-easy-mailchimp-extender' ),
-				'',  // callback + validation inside of admin/partials/menu/options.php
+				'', // callback + validation inside of admin/partials/menu/options.php
 				'yikes_easy_mc_settings_recpatcha_section'
 			);
 
 			add_settings_field(
 				'yikes-mc-recaptcha-secret-key',
 				__( 'Enter reCAPTCHA Secret Key', 'yikes-inc-easy-mailchimp-extender' ),
-				'',  // callback + validation inside of admin/partials/menu/options.php
+				'', // callback + validation inside of admin/partials/menu/options.php
 				'yikes_easy_mc_settings_recpatcha_section'
 			);
 
 			add_settings_field(
 				'yikes-mc-recaptcha-status',
 				__( 'Enable ReCaptcha', 'yikes-inc-easy-mailchimp-extender' ),
-				'',  // callback + validation inside of admin/partials/menu/options.php
+				'', // callback + validation inside of admin/partials/menu/options.php
 				'yikes_easy_mc_settings_recpatcha_section'
 			);
 
 		/* End reCAPTCHA Settings */
 
 		/* Debug Settings */
-			register_setting( 'yikes_inc_easy_mc_debug_settings_page' , 'yikes-mailchimp-debug-status' );
+			register_setting( 'yikes_inc_easy_mc_debug_settings_page', 'yikes-mailchimp-debug-status' );
 
 			/* Register Debug Settings Section */
 			add_settings_section(
@@ -1119,7 +1119,7 @@ 
 			add_settings_field(
 				'yikes-mailchimp-debug-status',
 				__( 'Enable Debugging', 'yikes-inc-easy-mailchimp-extender' ),
-				'',  // callback + validation inside of admin/partials/menu/options.php
+				'', // callback + validation inside of admin/partials/menu/options.php
 				'yikes_easy_mc_settings_debug_section'
 			);
 
@@ -1135,16 +1135,16 @@ 
 	*	@since complete re-write
 	**/
 	function yikes_mc_validate_api_key( $input ) {
-		if( $input == '' ) {
+		if ( $input == '' ) {
 			return;
 		}
 		$api_key = trim( $input );
 		$dash_position = strpos( trim( $input ), '-' );
-		if( $dash_position !== false ) {
+		if ( $dash_position !== false ) {
 			$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/helper/ping.json';
 		} else {
 			update_option( 'yikes-mc-api-invalid-key-response', __( 'Your API key appears to be invalid.', 'yikes-inc-easy-mailchimp-extender' ) );
-			update_option( 'yikes-mc-api-validation' , 'invalid_api_key' );
+			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );
 			return $api_key;
 		}
 		$request_args = array(
@@ -1155,17 +1155,17 @@ 
 			'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true ),
 		);
 		$api_key_response = wp_remote_post( $api_endpoint, $request_args );
-		if( ! is_wp_error( $api_key_response ) ) {
+		if ( ! is_wp_error( $api_key_response ) ) {
 			$body = json_decode( wp_remote_retrieve_body( $api_key_response ), true );
-			if( isset( $body['msg'] ) && $body['msg'] == "Everything's Chimpy!" ) {
-				update_option( 'yikes-mc-api-validation' , 'valid_api_key' );
+			if ( isset( $body[ 'msg' ] ) && $body[ 'msg' ] == "Everything's Chimpy!" ) {
+				update_option( 'yikes-mc-api-validation', 'valid_api_key' );
 			}
-		}  else {
+		} else {
 			require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-			$error_logging->yikes_easy_mailchimp_write_to_error_log( $api_key_response->get_error_message() , __( "Connecting to MailChimp" , 'yikes-inc-easy-mailchimp-extender' ) , __( "Settings Page/General Settings" , 'yikes-inc-easy-mailchimp-extender' ) );
-			update_option( 'yikes-mc-api-invalid-key-response' , $api_key_response->get_error_message() );
-			update_option( 'yikes-mc-api-validation' , 'invalid_api_key' );
+			$error_logging->yikes_easy_mailchimp_write_to_error_log( $api_key_response->get_error_message(), __( "Connecting to MailChimp", 'yikes-inc-easy-mailchimp-extender' ), __( "Settings Page/General Settings", 'yikes-inc-easy-mailchimp-extender' ) );
+			update_option( 'yikes-mc-api-invalid-key-response', $api_key_response->get_error_message() );
+			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );
 		}
 		// returned the api key
 		return $api_key;
@@ -1186,13 +1186,13 @@ 
 	*	to form fields. (input, dropdowns, buttons etc.)
 	* 	@since v5.5 re-write
 	**/
-	public function is_user_mc_api_valid_form( $echo=true ) {
-		if( $echo == true ) {
-			if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) == 'invalid_api_key' ) {
+	public function is_user_mc_api_valid_form( $echo = true ) {
+		if ( $echo == true ) {
+			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
 				echo 'disabled="disabled"';
 			}
 		} else {
-			if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) == 'invalid_api_key' ) {
+			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
 				return false;
 			} else {
 				return true;
@@ -1212,11 +1212,11 @@ 
 	public function check_for_old_yks_mc_options() {
 		$old_plugin_options = get_option( 'ykseme_storage' );
 		// only perform options migrations if the site is not a multi-site setup
-		if ( !is_multisite() ) {
-			if( apply_filters( 'yikes_mc_old_options_filter' , $old_plugin_options ) ) {
+		if ( ! is_multisite() ) {
+			if ( apply_filters( 'yikes_mc_old_options_filter', $old_plugin_options ) ) {
 				// display a notice to the user that they should 'migrate'
 				// from the old plugin settings to the new ones
-				add_action( 'admin_notices', array( $this , 'display_options_migrate_notice' ) , 11 );
+				add_action( 'admin_notices', array( $this, 'display_options_migrate_notice' ), 11 );
 			}
 		}
 	}
@@ -1249,11 +1249,11 @@ 
 
 			// Confirm that the necessary forms table in the database exists, else bail
 			global $wpdb;
-			if( $wpdb->get_var("show tables like '" . $wpdb->prefix . "yikes_easy_mc_forms'") != $wpdb->prefix . "yikes_easy_mc_forms" ) {
+			if ( $wpdb->get_var( "show tables like '" . $wpdb->prefix . "yikes_easy_mc_forms'" ) != $wpdb->prefix . "yikes_easy_mc_forms" ) {
 				return;
 			}
 
-			if( isset( $_GET['yikes-mc-options-migration-dismissed'] ) && $_GET['yikes-mc-options-migration-dismissed'] == 'true' ) {
+			if ( isset( $_GET[ 'yikes-mc-options-migration-dismissed' ] ) && $_GET[ 'yikes-mc-options-migration-dismissed' ] == 'true' ) {
 					// Delete the options, start a-new! (this will disable the migration notice altogether)
 					delete_option( 'widget_yikes_mc_widget' );
 					delete_option( 'api_validation' );
@@ -1267,18 +1267,18 @@ 
 			} else {
 			?>
 				<div class="yikes-easy-mc-updated migrate-options-notice">
-					<p><?php printf( __( "It looks like you're upgrading from a previous version of %s.", 'yikes-inc-easy-mailchimp-extender' ), '<strong>YIKES Inc. Easy Forms for MailChimp</strong>' ); ?> <?php printf( __( "In the newest version of %s, the options data structure has changed. We've also moved the mailing lists into its own database table to allow for some higher level customization. Now you can easily create multiple forms and assign them to the same mailing list." , 'yikes-inc-easy-mailchimp-extender' ), '<strong>YIKES Inc. Easy Forms for MailChimp</strong>' ); ?></p>
+					<p><?php printf( __( "It looks like you're upgrading from a previous version of %s.", 'yikes-inc-easy-mailchimp-extender' ), '<strong>YIKES Inc. Easy Forms for MailChimp</strong>' ); ?> <?php printf( __( "In the newest version of %s, the options data structure has changed. We've also moved the mailing lists into its own database table to allow for some higher level customization. Now you can easily create multiple forms and assign them to the same mailing list.", 'yikes-inc-easy-mailchimp-extender' ), '<strong>YIKES Inc. Easy Forms for MailChimp</strong>' ); ?></p>
 					<p><?php _e( "Before you continue, it's strongly recommended you the perform the migration to ensure the plugin continues to function properly.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 					<p><em><?php _e( "It's also strongly recommended that you take a backup of your database.", 'yikes-inc-easy-mailchimp-extender' ); ?></em></p>
 					<section id="migration-buttons">
 						<!-- migrate button -->
 						<form>
 							<input type="hidden" name="yikes-mc-update-option-structure" value="yikes-mc-update-option-structure" />
-							<a href="<?php echo wp_nonce_url( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-update' ) ), 'yikes-mc-migrate-options' , 'migrate_options_nonce' ); ?>" class="button-secondary"><?php _e( 'Perform Migration' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+							<a href="<?php echo wp_nonce_url( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-update' ) ), 'yikes-mc-migrate-options', 'migrate_options_nonce' ); ?>" class="button-secondary"><?php _e( 'Perform Migration', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 						</form>
 						<!-- dismiss button -->
 						<form>
-							<a href="<?php echo wp_nonce_url( esc_url_raw( admin_url() ), 'yikes-mc-dismiss-migration' , 'dismiss_migration_nonce' ); ?>" class="button-secondary"><?php _e( 'Dismiss Notice' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+							<a href="<?php echo wp_nonce_url( esc_url_raw( admin_url() ), 'yikes-mc-dismiss-migration', 'dismiss_migration_nonce' ); ?>" class="button-secondary"><?php _e( 'Dismiss Notice', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 						</form>
 					</section>
 
@@ -1292,9 +1292,9 @@ 
 		*	and return the index ( used to find the list name assigned to a form )
 		*	- http://stackoverflow.com/questions/6661530/php-multi-dimensional-array-search
 		*/
-		function findMCListID($id, $array) {
-		   foreach ($array as $key => $val) {
-			   if ($val['id'] === $id) {
+		function findMCListID( $id, $array ) {
+		   foreach ( $array as $key => $val ) {
+			   if ( $val[ 'id' ] === $id ) {
 				   return $key;
 			   }
 		   }
@@ -1304,9 +1304,9 @@ 
 		/* Ajax Migrate Options */
 		function migrate_archived_options() {
 			// all options prefixed with 'yikes-mc-'
-			$option_name = 'yikes-mc-'.$_POST['option_name'];
-			$option_value = $_POST['option_value'];
-			if( json_decode( $option_value ) ) {
+			$option_name = 'yikes-mc-' . $_POST[ 'option_name' ];
+			$option_value = $_POST[ 'option_value' ];
+			if ( json_decode( $option_value ) ) {
 				// decode our lists() array, and store it
 				$opt_value = json_decode( $option_value, true );
 			} else {
@@ -1319,24 +1319,24 @@ 
 
 		/* Ajax Migrate Forms */
 		function migrate_previously_setup_forms() {
-			$option_name = $_POST['option_name'];
-			$done = $_POST['done_import'];
+			$option_name = $_POST[ 'option_name' ];
+			$done = $_POST[ 'done_import' ];
 			// Create some starter forms for the user
 			// based on previously imported lists (to our old version)
-			if( $option_name == 'yikes-mc-lists' ) {
+			if ( $option_name == 'yikes-mc-lists' ) {
 				global $wpdb;
-				$option_value = $_POST['option_value'];
-				$new_options = json_decode( stripslashes_deep( $option_value ) , true );
+				$option_value = $_POST[ 'option_value' ];
+				$new_options = json_decode( stripslashes_deep( $option_value ), true );
 
-				$list_id = $new_options['id'];
-				$form_name = $new_options['name'];
-				$fields = $new_options['fields']; // our fields array
+				$list_id = $new_options[ 'id' ];
+				$form_name = $new_options[ 'name' ];
+				$fields = $new_options[ 'fields' ]; // our fields array
 
-				$custom_styles = isset( $new_options['custom_styles'] ) ? json_encode( $new_options['custom_styles'] ) : '0'; // store as an array with all of our styles
-				$custom_template = isset( $new_options['custom_template'] ) ? json_encode( $new_options['custom_template'] ) : '0'; // store template data as an array ( active , template used )
-				$send_welcome_email = isset( $new_options['yks_mailchimp_send_welcome_'.$list_id] ) ? '0' : '1';
-				$redirect_user_on_submit = isset( $new_options['yks_mailchimp_redirect_'.$list_id] ) ? '1' : '0';
-				$redirect_page = isset( $new_options['page_id_'.$list_id] ) ? $new_options['page_id_'.$list_id] : '';
+				$custom_styles = isset( $new_options[ 'custom_styles' ] ) ? json_encode( $new_options[ 'custom_styles' ] ) : '0'; // store as an array with all of our styles
+				$custom_template = isset( $new_options[ 'custom_template' ] ) ? json_encode( $new_options[ 'custom_template' ] ) : '0'; // store template data as an array ( active , template used )
+				$send_welcome_email = isset( $new_options[ 'yks_mailchimp_send_welcome_' . $list_id ] ) ? '0' : '1';
+				$redirect_user_on_submit = isset( $new_options[ 'yks_mailchimp_redirect_' . $list_id ] ) ? '1' : '0';
+				$redirect_page = isset( $new_options[ 'page_id_' . $list_id ] ) ? $new_options[ 'page_id_' . $list_id ] : '';
 
 				/* Insert Forms Function  */
 				$wpdb->insert(
@@ -1361,7 +1361,7 @@ 
 					)
 				);
 			}
-			if( $done == 'done' ) {
+			if ( $done == 'done' ) {
 				wp_send_json( array( 'form_name' => $form_name, 'completed_import' => true ) );
 			} else {
 				wp_send_json( array( 'form_name' => $form_name, 'completed_import' => false ) );
@@ -1376,35 +1376,35 @@ 
 		*	@since v5.6 - complete re-write
 		*/
 		public function generate_options_pages_sidebar_menu() {
-			if( isset( $_REQUEST['section'] ) ) {
-				$selected = $_REQUEST['section'];
+			if ( isset( $_REQUEST[ 'section' ] ) ) {
+				$selected = $_REQUEST[ 'section' ];
 			}
-			$installed_addons = get_option( 'yikes-easy-mc-active-addons' , array() );
+			$installed_addons = get_option( 'yikes-easy-mc-active-addons', array() );
 			// sort our addons array alphabetically so they appear in similar orders across all sites
 			asort( $installed_addons );
 			?>
-				<h3><span><?php _e( 'Additional Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
+				<h3><span><?php _e( 'Additional Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
 				<div class="inside">
 					<ul id="settings-nav">
-						<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>
-						<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>
-						<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>
-						<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>
-						<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>
-						<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>
+						<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>
+						<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>
+						<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>
+						<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>
+						<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>
+						<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>
 					</ul>
 					<?php
 						// create our add-on settings pages
-						if( !empty( $installed_addons ) ) {
+						if ( ! empty( $installed_addons ) ) {
 							?>
 							<hr class="add-on-settings-divider" />
-							<strong><?php _e( 'Addon Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+							<strong><?php _e( 'Addon Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 							<ul id="addon-settings-nav">
 							<?php
-							foreach( $installed_addons as $addon_name ) {
+							foreach ( $installed_addons as $addon_name ) {
 								?>
 									<li>
-										<?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>
+										<?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>
 								<?php
 							}
 							?>
@@ -1432,7 +1432,7 @@ 
 				)
 			);
 			?>
-				<h3><?php _e( 'Create a New Signup Form' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
+				<h3><?php _e( 'Create a New Signup Form', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
 
 				<div class="inside">
 
@@ -1441,31 +1441,31 @@ 
 					<form id="import-list-to-site" method="POST" action="<?php echo $url; ?>">
 						<input type="hidden" name="import-list-to-site" value="1" />
 						<!-- Name your new form -->
-						<label for="form-name"><strong><?php _e( 'Form Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-							<input type="text" class="widefat input-field" placeholder="<?php _e( 'Form Name' , 'yikes-inc-easy-mailchimp-extender' ); ?>" name="form-name" id="form-name" <?php $this->is_user_mc_api_valid_form( true ); ?> required>
+						<label for="form-name"><strong><?php _e( 'Form Name', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+							<input type="text" class="widefat input-field" placeholder="<?php _e( 'Form Name', 'yikes-inc-easy-mailchimp-extender' ); ?>" name="form-name" id="form-name" <?php $this->is_user_mc_api_valid_form( true ); ?> required>
 						</label>
 						<!-- Name your new form -->
-						<label for="form-description"><strong><?php _e( 'Form Description' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-							<textarea class="widefat input-field form-description" placeholder="<?php _e( 'Form Description' , 'yikes-inc-easy-mailchimp-extender' ); ?>" name="form-description" id="form-description" <?php $this->is_user_mc_api_valid_form( true ); ?>></textarea>
+						<label for="form-description"><strong><?php _e( 'Form Description', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+							<textarea class="widefat input-field form-description" placeholder="<?php _e( 'Form Description', 'yikes-inc-easy-mailchimp-extender' ); ?>" name="form-description" id="form-description" <?php $this->is_user_mc_api_valid_form( true ); ?>></textarea>
 						</label>
 						<!-- Associate this form with a list! -->
-						<label for="associated-list"><strong><?php _e( 'Associated List' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-							<select name="associated-list" id="associated-list" class=" input-field" <?php $this->is_user_mc_api_valid_form( true ); if( isset( $lists ) && empty( $lists ) ) { echo 'disabled="disabled"'; } ?>>
+						<label for="associated-list"><strong><?php _e( 'Associated List', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+							<select name="associated-list" id="associated-list" class=" input-field" <?php $this->is_user_mc_api_valid_form( true ); if ( isset( $lists ) && empty( $lists ) ) { echo 'disabled="disabled"'; } ?>>
 								<?php
-									if( isset( $lists ) && !empty( $lists ) ) {
-										foreach( $lists as $mailing_list ) {
+									if ( isset( $lists ) && ! empty( $lists ) ) {
+										foreach ( $lists as $mailing_list ) {
 											?>
-												<option value="<?php echo $mailing_list['id']; ?>"><?php echo stripslashes( $mailing_list['name'] ) . ' (' . $mailing_list['stats']['member_count'] . ') '; ?></option>
+												<option value="<?php echo $mailing_list[ 'id' ]; ?>"><?php echo stripslashes( $mailing_list[ 'name' ] ) . ' (' . $mailing_list[ 'stats' ][ 'member_count' ] . ') '; ?></option>
 											<?php
 										}
 									} else {
-										if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) == 'invalid_api_key' ) {
+										if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
 											?>
-												<option><?php echo __( "Please enter a valid API key." , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
+												<option><?php echo __( "Please enter a valid API key.", 'yikes-inc-easy-mailchimp-extender' ); ?></option>
 											<?php
 										} else {
 											?>
-												<option><?php echo __( "No lists were found on the account." , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
+												<option><?php echo __( "No lists were found on the account.", 'yikes-inc-easy-mailchimp-extender' ); ?></option>
 											<?php
 
 										}
@@ -1474,8 +1474,8 @@ 
 							</select>
 
 							<?php
-							if ( isset( $_GET['transient-cleared'] ) ) {
-								if ( 'true' === $_GET['transient-cleared'] ) {
+							if ( isset( $_GET[ 'transient-cleared' ] ) ) {
+								if ( 'true' === $_GET[ 'transient-cleared' ] ) {
 									?>
 									<div class="yikes-list-refreshed-notice">
 										<p><?php esc_attr_e( 'MailChimp list data has been succesfully refreshed.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -1484,11 +1484,11 @@ 
 								}
 							}
 
-							if( isset( $lists ) && empty( $lists ) ) {
-								if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) != 'invalid_api_key' ) {
+							if ( isset( $lists ) && empty( $lists ) ) {
+								if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'invalid_api_key' ) {
 									?>
 										<p class="description">
-											<?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' ) ); ?>
+											<?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' ) ); ?>
 										</p>
 									<?php
 								}
@@ -1496,12 +1496,12 @@ 
 							?>
 						</label>
 						<?php
-							if( $this->is_user_mc_api_valid_form( false ) ) {
-								echo submit_button( __( 'Create', 'yikes-inc-easy-mailchimp-extender' ) , 'primary' , '' , false , array( 'style' => 'margin:.75em 0 .5em 0;' ) );
+							if ( $this->is_user_mc_api_valid_form( false ) ) {
+								echo submit_button( __( 'Create', 'yikes-inc-easy-mailchimp-extender' ), 'primary', '', false, array( 'style' => 'margin:.75em 0 .5em 0;' ) );
 							} else {
-								echo '<p class="description">' . __( "Please enter a valid MailChimp API key to get started." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
+								echo '<p class="description">' . __( "Please enter a valid MailChimp API key to get started.", 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
 								?>
-									<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>
+									<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>
 								<?php
 							}
 						?>
@@ -1509,10 +1509,10 @@ 
 
 					<!-- Clear API CACHE -->
 					<?php
-					if( isset( $lists ) && ! empty( $lists ) ) {
+					if ( isset( $lists ) && ! empty( $lists ) ) {
 						if ( false !== get_transient( 'yikes-easy-mailchimp-list-data' ) ) { ?>
-							<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">
-								<input type="submit" class="button-secondary clear-mailchimp-api-cache" value="<?php _e( 'Refresh Lists' , 'yikes-inc-easy-mailchimp-extender' ); ?>" />
+							<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">
+								<input type="submit" class="button-secondary clear-mailchimp-api-cache" value="<?php _e( 'Refresh Lists', 'yikes-inc-easy-mailchimp-extender' ); ?>" />
 							</form>
 						<?php }
 					}
@@ -1528,14 +1528,14 @@ 
 		public function generate_page_redirect_dropdown( $redirect, $redirect_page, $custom_redirect_url ) {
 				$post_types = get_post_types();
 				?>
-				<label id="redirect-user-to-selection-label" for="redirect-user-to-selection" class="<?php if( $redirect == '0' ) { echo 'yikes-easy-mc-hidden'; } ?>">
-					<?php _e( "Select A Page or Post" , 'yikes-inc-easy-mailchimp-extender' ); ?>
+				<label id="redirect-user-to-selection-label" for="redirect-user-to-selection" class="<?php if ( $redirect == '0' ) { echo 'yikes-easy-mc-hidden'; } ?>">
+					<?php _e( "Select A Page or Post", 'yikes-inc-easy-mailchimp-extender' ); ?>
 					<select id="redirect-user-to-selection" name="redirect-user-to-selection" onchange="shouldWeDisplayCustomURL( this );return;">
 				<?php
 					// loop over registered post types, and query!
-						foreach( $post_types as $registered_post_type ) {
+						foreach ( $post_types as $registered_post_type ) {
 							// exclude a few built in custom post types
-							if( ! in_array( $registered_post_type , array( 'attachment' , 'revision' , 'nav_menu_item' ) ) ) {
+							if ( ! in_array( $registered_post_type, array( 'attachment', 'revision', 'nav_menu_item' ) ) ) {
 								// run our query, to retreive the posts
 								$pages = get_posts( array(
 									'order' => 'ASC',
@@ -1545,12 +1545,12 @@ 
 									'numberposts' => -1
 								) );
 								// only show cpt's that have posts assigned
-								if( !empty( $pages ) ) {
+								if ( ! empty( $pages ) ) {
 									?>
-									<optgroup label="<?php echo ucwords( str_replace( '_' , ' ' , $registered_post_type ) ); ?>">
+									<optgroup label="<?php echo ucwords( str_replace( '_', ' ', $registered_post_type ) ); ?>">
 									<?php
-										foreach( $pages as $page ) {
-											?><option <?php selected( $redirect_page , $page->ID ); ?> value="<?php echo $page->ID; ?>"><?php echo $page->post_title; ?></option><?php
+										foreach ( $pages as $page ) {
+											?><option <?php selected( $redirect_page, $page->ID ); ?> value="<?php echo $page->ID; ?>"><?php echo $page->post_title; ?></option><?php
 										}
 									?>
 									<option <?php selected( $redirect_page, 'custom_url' ); ?> value="custom_url"><?php echo __( 'Custom URL', 'yikes-inc-easy-mailchimp-extender' ); ?></option>
@@ -1562,8 +1562,8 @@ 
 					?>
 					</select>
 
-					<label name="custom-redirect-url" class="custom_redirect_url_label" <?php if( ! isset( $redirect_page ) || $redirect_page != 'custom_url' ) { echo 'style="display:none;"'; } ?>>
-						<?php _e( "Enter Custom URL" , 'yikes-inc-easy-mailchimp-extender' ); ?>
+					<label name="custom-redirect-url" class="custom_redirect_url_label" <?php if ( ! isset( $redirect_page ) || $redirect_page != 'custom_url' ) { echo 'style="display:none;"'; } ?>>
+						<?php _e( "Enter Custom URL", 'yikes-inc-easy-mailchimp-extender' ); ?>
 						<input type="text" class="widefat custom-redirect-url" name="custom-redirect-url" value="<?php echo $custom_redirect_url; ?>" />
 					</label>
 
@@ -1580,11 +1580,11 @@ 
 		public function generate_show_some_love_container() {
 			// if no active add-ons are installed,
 			// lets display our branding and add-on sidebar
-			if( get_option( 'yikes-easy-mc-active-addons' , array() ) == array() ) {
+			if ( get_option( 'yikes-easy-mc-active-addons', array() ) == array() ) {
 
 				/* On Edit Forms Page Display Upsell to Customizer */
 				$screen = get_current_screen();
-				if( isset( $screen ) && $screen->base == 'admin_page_yikes-mailchimp-edit-form' ) {
+				if ( isset( $screen ) && $screen->base == 'admin_page_yikes-mailchimp-edit-form' ) {
 				?>
 
 					<div class="postbox yikes-easy-mc-postbox show-some-love-container">
@@ -1598,11 +1598,11 @@ 
 					<div class="postbox yikes-easy-mc-postbox show-some-love-container">
 
 						<!-- review us container -->
-						<h3 data-alt-text="<?php _e( 'About YIKES Inc.', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Show YIKES Inc. Some Love' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
+						<h3 data-alt-text="<?php _e( 'About YIKES Inc.', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Show YIKES Inc. Some Love', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
 						<div id="review-yikes-easy-mc" class="inside">
 
 							<p>
-								<?php _e( 'Leave a review' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<?php _e( 'Leave a review', 'yikes-inc-easy-mailchimp-extender' ); ?>
 								<p class="star-container">
 									<a href="https://wordpress.org/support/view/plugin-reviews/yikes-inc-easy-mailchimp-extender" target="_blank">
 										<b class="dashicons dashicons-star-filled"></b>
@@ -1614,21 +1614,21 @@ 
 								</p>
 							</p>
 
-							<?php _e( 'Tweet about it' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+							<?php _e( 'Tweet about it', 'yikes-inc-easy-mailchimp-extender' ); ?>
 							<p class="sidebar-container">
 								<a href="https://twitter.com/share" class="twitter-share-button" data-url="https://wordpress.org/plugins/yikes-inc-easy-mailchimp-extender/" data-text="I'm using the Easy Forms for MailChimp plugin by @YikesInc to grow my mailing list - it's awesome! -" data-hashtags="MailChimp">Tweet</a>
 								<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
 							</p>
 
-							<?php _e( 'Vote that the plugin works' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+							<?php _e( 'Vote that the plugin works', 'yikes-inc-easy-mailchimp-extender' ); ?>
 							<p class="sidebar-container">
 								<a href="https://wordpress.org/plugins/yikes-inc-easy-mailchimp-extender/" target="_blank">
-									<?php _e( 'Vote for Compatibility' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+									<?php _e( 'Vote for Compatibility', 'yikes-inc-easy-mailchimp-extender' ); ?>
 								</a>
 							</p>
 						</div>
 
-						<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>
+						<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>
 
 						<section id="about-yikes-inc" class="inside">
 							<a href="https://www.yikesinc.com" target="_blank" title="YIKES Inc.">
@@ -1644,10 +1644,10 @@ 
 					<div class="postbox yikes-easy-mc-postbox">
 
 						<!-- review us container -->
-						<h3><?php _e( 'Easy Forms for MailChimp Add-Ons' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
+						<h3><?php _e( 'Easy Forms for MailChimp Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
 						<div id="review-yikes-easy-mc" class="inside">
-							<p><?php _e( "Check out available add-ons for some seriously enhanced features." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
-							<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>
+							<p><?php _e( "Check out available add-ons for some seriously enhanced features.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+							<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>
 						</div>
 
 					</div>
@@ -1672,76 +1672,76 @@ 
 		public function generate_form_editor( $form_fields, $list_id, $merge_variables, $interest_groups ) {
 
 			// if no list id, die!
-			if( ! $list_id ) {
-				die( __( "We've encountered an error. No list ID was sent." , 'yikes-inc-easy-mailchimp-extender' ) );
+			if ( ! $list_id ) {
+				die( __( "We've encountered an error. No list ID was sent.", 'yikes-inc-easy-mailchimp-extender' ) );
 			}
 
-			if( ! $merge_variables ) {
-				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' ) );
+			if ( ! $merge_variables ) {
+				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' ) );
 			}
 
-			if( ! empty( $form_fields ) ) {
+			if ( ! empty( $form_fields ) ) {
 
 				// find any fields that are assigned to this form, that don't exist in MailChimp
 				// or else were going to run into issues when we submit the form
 				$available_merge_variables = array();
 				$available_interest_groups = array();
 
-				$assigned_fields= array();
+				$assigned_fields = array();
 
 				// loop over merge variables
-				if( ! empty( $merge_variables['data'][0]['merge_vars'] ) ) {
-					foreach( $merge_variables['data'][0]['merge_vars'] as $merge_tag ) {
-						$available_merge_variables[] = $merge_tag['tag'];
+				if ( ! empty( $merge_variables[ 'data' ][ 0 ][ 'merge_vars' ] ) ) {
+					foreach ( $merge_variables[ 'data' ][ 0 ][ 'merge_vars' ] as $merge_tag ) {
+						$available_merge_variables[ ] = $merge_tag[ 'tag' ];
 					}
 				}
 
 				// loop over interest groups
-				if( ! empty( $interest_groups ) && ! isset( $interest_groups['error'] ) ) {
-					foreach( $interest_groups as $interest_group ) {
-						$available_interest_groups[] = $interest_group['id'];
+				if ( ! empty( $interest_groups ) && ! isset( $interest_groups[ 'error' ] ) ) {
+					foreach ( $interest_groups as $interest_group ) {
+						$available_interest_groups[ ] = $interest_group[ 'id' ];
 					}
 				}
 
 				// build our assigned fields
-				foreach( $form_fields as $field => $value ) {
-					$assigned_fields[] = $field;
+				foreach ( $form_fields as $field => $value ) {
+					$assigned_fields[ ] = $field;
 				}
 
-				$merged_fields = array_merge( $available_merge_variables , $available_interest_groups );
-				$excluded_fields = array_diff( $assigned_fields , $merged_fields );
+				$merged_fields = array_merge( $available_merge_variables, $available_interest_groups );
+				$excluded_fields = array_diff( $assigned_fields, $merged_fields );
 
 				$i = 1;
-				foreach( $form_fields as $field ) {
+				foreach ( $form_fields as $field ) {
 
-					if( isset( $field['merge'] ) ) {
+					if ( isset( $field[ 'merge' ] ) ) {
 					?>
-						<section class="draggable" id="<?php echo $field['merge']; ?>">
+						<section class="draggable" id="<?php echo $field[ 'merge' ]; ?>">
 							<!-- top -->
 							<a href="#" class="expansion-section-title settings-sidebar">
-								<span class="dashicons dashicons-plus"></span><?php echo stripslashes( $field['label'] ); ?>
-								<?php if( in_array( $field['merge'] , $excluded_fields ) ) { ?>
-									<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' ); ?>">
+								<span class="dashicons dashicons-plus"></span><?php echo stripslashes( $field[ 'label' ] ); ?>
+								<?php if ( in_array( $field[ 'merge' ], $excluded_fields ) ) { ?>
+									<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' ); ?>">
 								<?php } ?>
-								<span class="field-type-text"><small><?php echo __( 'type' , 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field['type']; ?></small></span>
+								<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field[ 'type' ]; ?></small></span>
 							</a>
 							<!-- expansion section -->
 							<div class="yikes-mc-settings-expansion-section">
 
-								<?php if( in_array( $field['merge'] , $excluded_fields ) ) { ?>
-									<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>
+								<?php if ( in_array( $field[ 'merge' ], $excluded_fields ) ) { ?>
+									<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>
 								<?php } ?>
 
 								<!-- store the label -->
-								<input type="hidden" name="field[<?php echo $field['merge']; ?>][label]" value="<?php echo $field['label']; ?>" />
-								<input type="hidden" name="field[<?php echo $field['merge']; ?>][type]" value="<?php echo $field['type']; ?>" />
-								<input type="hidden" name="field[<?php echo $field['merge']; ?>][merge]" value="<?php echo $field['merge']; ?>" />
-								<input type="hidden" class="field-<?php echo $field['merge']; ?>-position position-input" name="field[<?php echo $field['merge']; ?>][position]" value="<?php echo $i++; ?>" />
+								<input type="hidden" name="field[<?php echo $field[ 'merge' ]; ?>][label]" value="<?php echo $field[ 'label' ]; ?>" />
+								<input type="hidden" name="field[<?php echo $field[ 'merge' ]; ?>][type]" value="<?php echo $field[ 'type' ]; ?>" />
+								<input type="hidden" name="field[<?php echo $field[ 'merge' ]; ?>][merge]" value="<?php echo $field[ 'merge' ]; ?>" />
+								<input type="hidden" class="field-<?php echo $field[ 'merge' ]; ?>-position position-input" name="field[<?php echo $field[ 'merge' ]; ?>][position]" value="<?php echo $i++; ?>" />
 
-								<?php if ( $field['type'] == 'radio' || $field['type'] == 'dropdown' || $field['type'] == 'select' ) {
-									$choices = json_decode( $field['choices'], true );
+								<?php if ( $field[ 'type' ] == 'radio' || $field[ 'type' ] == 'dropdown' || $field[ 'type' ] == 'select' ) {
+									$choices = json_decode( $field[ 'choices' ], true );
 								?>
-									<input type="hidden" name="field[<?php echo $field['merge']; ?>][choices]" value='<?php echo esc_attr( json_encode( $choices ) ); ?>' />
+									<input type="hidden" name="field[<?php echo $field[ 'merge' ]; ?>][choices]" value='<?php echo esc_attr( json_encode( $choices ) ); ?>' />
 								<?php } ?>
 
 								<!-- Single or Double Opt-in -->
@@ -1753,16 +1753,16 @@ 
 										<tr valign="top">
 											<td scope="row">
 												<label for="merge-tag">
-													<?php _e( 'Merge Tag' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+													<?php _e( 'Merge Tag', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<input class="widefat merge-tag-text" type="text" readonly value="<?php echo $field['merge']; ?>">
+												<input class="widefat merge-tag-text" type="text" readonly value="<?php echo $field[ 'merge' ]; ?>">
 											</td>
 										</tr>
 
 										<!-- Placeholder Value -->
-										<?php switch( $field['type'] ) {
+										<?php switch ( $field[ 'type' ] ) {
 
 											case 'text':
 											case 'email':
@@ -1777,12 +1777,12 @@ 
 										<tr valign="top">
 											<td scope="row">
 												<label for="placeholder">
-													<?php _e( 'Placeholder' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+													<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<input type="text" class="widefat" name="field[<?php echo $field['merge']; ?>][placeholder]" value="<?php echo isset( $field['placeholder'] ) ? $field['placeholder'] : '' ; ?>" />
-												<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+												<input type="text" class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][placeholder]" value="<?php echo isset( $field[ 'placeholder' ] ) ? $field[ 'placeholder' ] : ''; ?>" />
+												<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 											</td>
 										</tr>
 										<?php
@@ -1791,7 +1791,7 @@ 
 										?>
 
 										<!-- Default Value -->
-										<?php switch( $field['type'] ) {
+										<?php switch ( $field[ 'type' ] ) {
 											default:
 											case 'text':
 											case 'number':
@@ -1800,17 +1800,17 @@ 
 											<tr valign="top">
 												<td scope="row">
 													<label for="placeholder">
-														<?php _e( 'Default Value' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+														<?php _e( 'Default Value', 'yikes-inc-easy-mailchimp-extender' ); ?>
 													</label>
 												</td>
 												<td>
-													<input <?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 } ?> />
-													<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>
+													<input <?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 } ?> />
+													<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>
 													<?php
-													switch( $field['type'] ) {
+													switch ( $field[ 'type' ] ) {
 														case 'text':
 															?>
-																<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>
+																<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>
 															<?php
 														break;
 													} ?>
@@ -1824,18 +1824,18 @@ 
 												<tr valign="top">
 													<td scope="row">
 														<label for="placeholder">
-															<?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+															<?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
 														</label>
 													</td>
 													<td>
-														<?php if( ! isset( $field['default_choice'] ) || empty( $field['default_choice'] ) ) { $decode = json_decode( $field['choices'], true ); $field['default_choice'] = $decode[0]; }
+														<?php if ( ! isset( $field[ 'default_choice' ] ) || empty( $field[ 'default_choice' ] ) ) { $decode = json_decode( $field[ 'choices' ], true ); $field[ 'default_choice' ] = $decode[ 0 ]; }
 														$x = 0;
-														foreach( json_decode( $field['choices'], true ) as $choice => $value ) { ?>
-															<label for="<?php echo $field['merge'].'-'.$x; ?>">
-																<input id="<?php echo $field['merge'].'-'.$x; ?>" type="radio" name="field[<?php echo $field['merge']; ?>][default_choice]" value="<?php echo $x; ?>" <?php checked( $field['default_choice'], $x ); ?>><?php echo $value; ?>&nbsp;
+														foreach ( json_decode( $field[ 'choices' ], true ) as $choice => $value ) { ?>
+															<label for="<?php echo $field[ 'merge' ] . '-' . $x; ?>">
+																<input id="<?php echo $field[ 'merge' ] . '-' . $x; ?>" type="radio" name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]" value="<?php echo $x; ?>" <?php checked( $field[ 'default_choice' ], $x ); ?>><?php echo $value; ?>&nbsp;
 															</label>
 														<?php $x++; } ?>
-														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 													</td>
 												</tr>
 
@@ -1847,16 +1847,16 @@ 
 												<tr valign="top">
 													<td scope="row">
 														<label for="placeholder">
-															<?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+															<?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
 														</label>
 													</td>
 													<td>
-														<select type="default" name="field[<?php echo $field['merge']; ?>][default_choice]">
-															<?php foreach( json_decode( $field['choices'], true ) as $choice => $value ) { ?>
-																<option value="<?php echo $choice; ?>" <?php selected( $field['default_choice'] , $choice ); ?>><?php echo $value; ?></option>
+														<select type="default" name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]">
+															<?php foreach ( json_decode( $field[ 'choices' ], true ) as $choice => $value ) { ?>
+																<option value="<?php echo $choice; ?>" <?php selected( $field[ 'default_choice' ], $choice ); ?>><?php echo $value; ?></option>
 															<?php } ?>
 														</select>
-														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 													</td>
 												</tr>
 
@@ -1876,69 +1876,69 @@ 
 										<tr valign="top">
 											<td scope="row">
 												<label for="placeholder">
-													<?php _e( 'Description' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+													<?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<textarea class="widefat field-description-input" name="field[<?php echo $field['merge']; ?>][description]"><?php echo isset( $field['description'] ) ? stripslashes( esc_html( $field['description'] ) ) : '' ; ?></textarea>
-												<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>
+												<textarea class="widefat field-description-input" name="field[<?php echo $field[ 'merge' ]; ?>][description]"><?php echo isset( $field[ 'description' ] ) ? stripslashes( esc_html( $field[ 'description' ] ) ) : ''; ?></textarea>
+												<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>
 											</td>
 										</tr>
 										<!-- Additional Classes -->
 										<tr valign="top">
 											<td scope="row">
 												<label for="placeholder">
-													<?php _e( 'Additional Classes' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+													<?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<input type="text" 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'] ) ) : '' ; ?>" />
-												<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>
+												<input type="text" 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' ] ) ) : ''; ?>" />
+												<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>
 											</td>
 										</tr>
 										<!-- Required Toggle -->
 										<tr valign="top">
 											<td scope="row">
 												<label for="field-required">
-													<?php _e( 'Field Required?' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+													<?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<?php $checked = isset( $field['require'] ) ? $field['require'] : '0'; ?>
-												<input 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' ); } ?>">
-												<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>
+												<?php $checked = isset( $field[ 'require' ] ) ? $field[ 'require' ] : '0'; ?>
+												<input 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' ); } ?>">
+												<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>
 											</td>
 										</tr>
 										<!-- Visible Toggle -->
 										<tr valign="top">
 											<td scope="row">
 												<label for="hide-field">
-													<?php _e( 'Hide Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+													<?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<?php $hide = isset( $field['hide'] ) ? $field['hide'] : '0'; ?>
-												<input 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' ); } ?>">
-												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+												<?php $hide = isset( $field[ 'hide' ] ) ? $field[ 'hide' ] : '0'; ?>
+												<input 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' ); } ?>">
+												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 											</td>
 										</tr>
 										<!-- Toggle Field Label Visibility -->
 										<tr valign="top">
 											<td scope="row">
 												<label for="placeholder">
-													<?php _e( 'Hide Label' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+													<?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<?php $hide_label = isset( $field['hide-label'] ) ? $field['hide-label'] : '0'; ?>
-												<input type="checkbox" name="field[<?php echo $field['merge']; ?>][hide-label]" value="1" <?php checked( $hide_label , 1 ); ?>/>
-												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+												<?php $hide_label = isset( $field[ 'hide-label' ] ) ? $field[ 'hide-label' ] : '0'; ?>
+												<input type="checkbox" name="field[<?php echo $field[ 'merge' ]; ?>][hide-label]" value="1" <?php checked( $hide_label, 1 ); ?>/>
+												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 											</td>
 										</tr>
 										<!-- Display Phone/Date Formats back to the user -->
 										<!-- Phone Format Initial Load -->
 										<?php
-											switch( $field['type'] ) {
+											switch ( $field[ 'type' ] ) {
 												/* Store the phone format, for properly regex pattern */
 												case 'phone':
 												case 'birthday':
@@ -1948,23 +1948,23 @@ 
 															<td scope="row">
 																<label for="placeholder">
 																	<?php
-																		switch( $field['type'] ) {
+																		switch ( $field[ 'type' ] ) {
 																			default:
 																			case 'birthday':
-																				$type = __( 'Date Format' , 'yikes-inc-easy-mailchimp-extender' );
-																				$format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'MM/DD';
+																				$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );
+																				$format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'MM/DD';
 																				$format_name = 'date_format';
 																				break;
 
 																			case 'date':
-																				$type = __( 'Date Format' , 'yikes-inc-easy-mailchimp-extender' );
-																				$format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'MM/DD/YYYY';
+																				$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );
+																				$format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'MM/DD/YYYY';
 																				$format_name = 'date_format';
 																				break;
 
 																			case 'phone':
-																				$type = __( 'Phone Format' , 'yikes-inc-easy-mailchimp-extender' );
-																				$format = ( ( $field['phone_format'] == 'none' ) ? __( 'International', 'yikes-inc-easy-mailchimp-extender' ) : $field['phone_format'] . ' - (###) ### - ####' );
+																				$type = __( 'Phone Format', 'yikes-inc-easy-mailchimp-extender' );
+																				$format = ( ( $field[ 'phone_format' ] == 'none' ) ? __( 'International', 'yikes-inc-easy-mailchimp-extender' ) : $field[ 'phone_format' ] . ' - (###) ### - ####' );
 																				$format_name = 'phone_format';
 																				break;
 																		}
@@ -1974,7 +1974,7 @@ 
 															</td>
 															<td>
 																<strong><?php echo $format; ?></strong>
-																<input type="hidden" name="field[<?php echo $field['merge']; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" />
+																<input type="hidden" name="field[<?php echo $field[ 'merge' ]; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" />
 																<p class="description"><small>
 																	<?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' ) ); ?>
 																</small></p>
@@ -1995,8 +1995,8 @@ 
 											</td>
 											<td>
 												<span class="toggle-container">
-													<a href="#" class="close-form-expansion"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
-													<a href="#" class="remove-field" alt="<?php echo $field['merge']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+													<a href="#" class="close-form-expansion"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
+													<a href="#" class="remove-field" alt="<?php echo $field[ 'merge' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 												</span>
 											</td>
 										</tr>
@@ -2012,35 +2012,35 @@ 
 					} else { // THIS IS AN INTEREST GROUP!
 
 						?>
-						<section class="draggable" id="<?php echo $field['group_id']; ?>">
+						<section class="draggable" id="<?php echo $field[ 'group_id' ]; ?>">
 							<!-- top -->
 							<a href="#" class="expansion-section-title settings-sidebar">
-								<span class="dashicons dashicons-plus"></span><?php echo stripslashes( $field['label'] ); ?>
-								<?php if( in_array( $field['group_id'] , $excluded_fields ) ) { ?>
-									<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' ); ?>">
+								<span class="dashicons dashicons-plus"></span><?php echo stripslashes( $field[ 'label' ] ); ?>
+								<?php if ( in_array( $field[ 'group_id' ], $excluded_fields ) ) { ?>
+									<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' ); ?>">
 								<?php } ?>
-								<span class="field-type-text"><small><?php echo __( 'type' , 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field['type']; ?></small></span>
+								<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field[ 'type' ]; ?></small></span>
 							</a>
 							<!-- expansion section -->
 							<div class="yikes-mc-settings-expansion-section">
 
 								<!-- check if this field exists in the available interest group array -->
-								<?php if( in_array( $field['group_id'] , $excluded_fields ) ) { ?>
-									<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>
+								<?php if ( in_array( $field[ 'group_id' ], $excluded_fields ) ) { ?>
+									<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>
 								<?php } ?>
 
 								<!-- store the label -->
-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][label]" value="<?php echo $field['label']; ?>" />
-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][type]" value="<?php echo $field['type']; ?>" />
-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][group_id]" value="<?php echo $field['group_id']; ?>" />
-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][groups]" value='<?php echo esc_attr( json_encode( json_decode( $field['groups'], true ) ) ); ?>' />
+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][label]" value="<?php echo $field[ 'label' ]; ?>" />
+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][type]" value="<?php echo $field[ 'type' ]; ?>" />
+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][group_id]" value="<?php echo $field[ 'group_id' ]; ?>" />
+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][groups]" value='<?php echo esc_attr( json_encode( json_decode( $field[ 'groups' ], true ) ) ); ?>' />
 
 								<!-- Single or Double Opt-in -->
 								<p class="type-container"><!-- necessary to prevent skipping on slideToggle(); -->
 
 									<table class="form-table form-field-container">
 										<!-- Default Value -->
-										<?php switch( $field['type'] ) {
+										<?php switch ( $field[ 'type' ] ) {
 
 											default:
 											case 'radio':
@@ -2049,26 +2049,26 @@ 
 												<tr valign="top">
 													<td scope="row">
 														<label for="placeholder">
-															<?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+															<?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
 														</label>
 													</td>
 													<td>
 														<?php
-															if( $field['type'] != 'checkboxes' ) {
-																if( !isset( $field['default_choice'] ) ) { $field['default_choice'] =  json_decode( stripslashes( $field['groups'] ) , true ); }
+															if ( $field[ 'type' ] != 'checkboxes' ) {
+																if ( ! isset( $field[ 'default_choice' ] ) ) { $field[ 'default_choice' ] = json_decode( stripslashes( $field[ 'groups' ] ), true ); }
 															} else {
-																if( !isset( $field['default_choice'] ) ) { $field['default_choice'] = array(); }
+																if ( ! isset( $field[ 'default_choice' ] ) ) { $field[ 'default_choice' ] = array(); }
 															}
 														$i = 0;
-														foreach( json_decode( $field['groups'], true ) as $group ) { ?>
-															<label for="<?php echo $field['group_id'].'-'.$i; ?>">
-																<input id="<?php echo $field['group_id'].'-'.$i; ?>" type="<?php if( $field['type'] == 'radio' || $field['type'] == 'hidden' ) { ?>radio<?php } else if( $field['type'] == 'checkboxes' ) { ?>checkbox<?php } ?>" name="field[<?php echo $field['group_id']; ?>][default_choice]<?php if( $field['type'] == 'checkboxes' ) {echo '[]';}?>" value="<?php echo $i; ?>" <?php if( $field['type'] == 'radio' || $field['type'] == 'hidden' ) { checked( $field['default_choice'][0] , $i ); } else if( $field['type'] == 'checkboxes' ) { if( in_array( $i , $field['default_choice'] ) ) { echo 'checked="checked"'; } }?>><?php echo stripslashes( str_replace( '' , '\'' , $group['name'] ) ); ?>&nbsp;
+														foreach ( json_decode( $field[ 'groups' ], true ) as $group ) { ?>
+															<label for="<?php echo $field[ 'group_id' ] . '-' . $i; ?>">
+																<input id="<?php echo $field[ 'group_id' ] . '-' . $i; ?>" type="<?php if ( $field[ 'type' ] == 'radio' || $field[ 'type' ] == 'hidden' ) { ?>radio<?php } else if ( $field[ 'type' ] == 'checkboxes' ) { ?>checkbox<?php } ?>" name="field[<?php echo $field[ 'group_id' ]; ?>][default_choice]<?php if ( $field[ 'type' ] == 'checkboxes' ) {echo '[]'; }?>" value="<?php echo $i; ?>" <?php if ( $field[ 'type' ] == 'radio' || $field[ 'type' ] == 'hidden' ) { checked( $field[ 'default_choice' ][ 0 ], $i ); } else if ( $field[ 'type' ] == 'checkboxes' ) { if ( in_array( $i, $field[ 'default_choice' ] ) ) { echo 'checked="checked"'; } }?>><?php echo stripslashes( str_replace( '', '\'', $group[ 'name' ] ) ); ?>&nbsp;
 															</label>
 														<?php
 															$i++;
 															}
 														?>
-														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 													</td>
 												</tr>
 
@@ -2080,16 +2080,16 @@ 
 												<tr valign="top">
 													<td scope="row">
 														<label for="placeholder">
-															<?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+															<?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
 														</label>
 													</td>
 													<td>
-														<select type="default" name="field[<?php echo $field['group_id']; ?>][default_choice]">
-															<?php $i = 0; foreach( json_decode( stripslashes_deep( $field['groups'] ) , true ) as  $group ) { ?>
-																<option value="<?php echo $i; ?>" <?php selected( $field['default_choice'] , $i ); ?>><?php echo stripslashes( $group['name'] ); ?></option>
+														<select type="default" name="field[<?php echo $field[ 'group_id' ]; ?>][default_choice]">
+															<?php $i = 0; foreach ( json_decode( stripslashes_deep( $field[ 'groups' ] ), true ) as  $group ) { ?>
+																<option value="<?php echo $i; ?>" <?php selected( $field[ 'default_choice' ], $i ); ?>><?php echo stripslashes( $group[ 'name' ] ); ?></option>
 															<?php $i++; } ?>
 														</select>
-														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 													</td>
 												</tr>
 
@@ -2103,12 +2103,12 @@ 
 										<tr valign="top">
 											<td scope="row">
 												<label for="placeholder">
-													<?php _e( 'Description' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+													<?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<textarea class="widefat field-description-input" name="field[<?php echo $field['group_id']; ?>][description]"><?php echo isset( $field['description'] ) ? stripslashes( esc_html( $field['description'] ) ) : '' ; ?></textarea>
-												<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>
+												<textarea class="widefat field-description-input" name="field[<?php echo $field[ 'group_id' ]; ?>][description]"><?php echo isset( $field[ 'description' ] ) ? stripslashes( esc_html( $field[ 'description' ] ) ) : ''; ?></textarea>
+												<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>
 											</td>
 										</tr>
 
@@ -2116,51 +2116,51 @@ 
 										<tr valign="top">
 											<td scope="row">
 												<label for="placeholder">
-													<?php _e( 'Additional Classes' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+													<?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<input type="text" 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'] ) ) : '' ; ?>" />
-												<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>
+												<input type="text" 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' ] ) ) : ''; ?>" />
+												<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>
 											</td>
 										</tr>
 										<!-- Required Toggle -->
 										<tr valign="top">
 											<td scope="row">
 												<label for="field-required">
-													<?php _e( 'Field Required?' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+													<?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<?php $checked = isset( $field['require'] ) ? $field['require'] : '0'; ?>
-												<input type="checkbox" class="widefat" value="1" name="field[<?php echo $field['group_id']; ?>][require]" <?php checked( $checked , 1 ); ?>>
-												<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>
+												<?php $checked = isset( $field[ 'require' ] ) ? $field[ 'require' ] : '0'; ?>
+												<input type="checkbox" class="widefat" value="1" name="field[<?php echo $field[ 'group_id' ]; ?>][require]" <?php checked( $checked, 1 ); ?>>
+												<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>
 											</td>
 										</tr>
 										<!-- Visible Toggle -->
 										<tr valign="top">
 											<td scope="row">
 												<label for="hide-field">
-													<?php _e( 'Hide Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+													<?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<?php $hide = isset( $field['hide'] ) ? $field['hide'] : '0'; ?>
-												<input type="checkbox" class="widefat" value="1" name="field[<?php echo $field['group_id']; ?>][hide]" <?php checked( $hide , 1 ); ?>>
-												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+												<?php $hide = isset( $field[ 'hide' ] ) ? $field[ 'hide' ] : '0'; ?>
+												<input type="checkbox" class="widefat" value="1" name="field[<?php echo $field[ 'group_id' ]; ?>][hide]" <?php checked( $hide, 1 ); ?>>
+												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 											</td>
 										</tr>
 										<!-- Toggle Field Label Visibility -->
 										<tr valign="top">
 											<td scope="row">
 												<label for="placeholder">
-													<?php _e( 'Hide Label' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+													<?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<?php $hide = isset( $field['hide-label'] ) ? $field['hide-label'] : '0'; ?>
-												<input type="checkbox" name="field[<?php echo $field['group_id']; ?>][hide-label]" value="1" <?php checked( $hide , 1 ); ?>/>
-												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+												<?php $hide = isset( $field[ 'hide-label' ] ) ? $field[ 'hide-label' ] : '0'; ?>
+												<input type="checkbox" name="field[<?php echo $field[ 'group_id' ]; ?>][hide-label]" value="1" <?php checked( $hide, 1 ); ?>/>
+												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 											</td>
 										</tr>
 										<!-- Toggle Buttons -->
@@ -2170,8 +2170,8 @@ 
 											</td>
 											<td>
 												<span class="toggle-container">
-													<a href="#" class="close-form-expansion"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
-													<a href="#" class="remove-field" alt="<?php echo $field['group_id']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+													<a href="#" class="close-form-expansion"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
+													<a href="#" class="remove-field" alt="<?php echo $field[ 'group_id' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 												</span>
 											</td>
 										</tr>
@@ -2185,38 +2185,38 @@ 
 				}
 			} else {
 				?>
-					<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>
+					<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>
 				<?php
 			}
 				/* Pre Defined Merge Tag Container - Always rendered so the modal appears and links are clickable on initial page load */
 				add_thickbox();
 				// enqueue jquery qtip for our tooltip
-				wp_enqueue_script( 'jquery-qtip-tooltip' , YIKES_MC_URL . 'admin/js/min/jquery.qtip.min.js' , array( 'jquery' ) );
-				wp_enqueue_style( 'jquery-qtip-style' ,  YIKES_MC_URL . 'admin/css/jquery.qtip.min.css' );
+				wp_enqueue_script( 'jquery-qtip-tooltip', YIKES_MC_URL . 'admin/js/min/jquery.qtip.min.js', array( 'jquery' ) );
+				wp_enqueue_style( 'jquery-qtip-style', YIKES_MC_URL . 'admin/css/jquery.qtip.min.css' );
 					$available_tags = array(
 						array(
 							'tag' => '{page_title}',
-							'description' => '<h4 class="tooltip-title">' . __( 'Page Title', 'yikes-inc-easy-mailchimp-extender' ) . ' | <small>{page_title}</small></h4><hr />' . __( 'Pre-populate the field with the current page or post title that the user is on when opting in to your mailing list.' , 'yikes-inc-easy-mailchimp-extender' ),
+							'description' => '<h4 class="tooltip-title">' . __( 'Page Title', 'yikes-inc-easy-mailchimp-extender' ) . ' | <small>{page_title}</small></h4><hr />' . __( 'Pre-populate the field with the current page or post title that the user is on when opting in to your mailing list.', 'yikes-inc-easy-mailchimp-extender' ),
 							'title' => __( 'Page Title', 'yikes-inc-easy-mailchimp-extender' )
 						),
 						array(
 							'tag' => '{page_id}',
-							'description' => '<h4 class="tooltip-title">' . __( 'Page ID', 'yikes-inc-easy-mailchimp-extender' ) . ' | <small>{page_id}</small></h4><hr />' . __( 'Pre-populate the field with the current page or post ID that the user is on when opting in to your mailing list.' , 'yikes-inc-easy-mailchimp-extender' ),
+							'description' => '<h4 class="tooltip-title">' . __( 'Page ID', 'yikes-inc-easy-mailchimp-extender' ) . ' | <small>{page_id}</small></h4><hr />' . __( 'Pre-populate the field with the current page or post ID that the user is on when opting in to your mailing list.', 'yikes-inc-easy-mailchimp-extender' ),
 							'title' => __( 'Page ID', 'yikes-inc-easy-mailchimp-extender' )
 						),
 						array(
 							'tag' => '{page_url}',
-							'description' => '<h4 class="tooltip-title">' . __( 'Page URL', 'yikes-inc-easy-mailchimp-extender' ) . ' | <small>{page_url}</small></h4><hr />' . __( 'Pre-populate the field with the current page URL that the user is on when opting in to your mailing list.' , 'yikes-inc-easy-mailchimp-extender' ),
+							'description' => '<h4 class="tooltip-title">' . __( 'Page URL', 'yikes-inc-easy-mailchimp-extender' ) . ' | <small>{page_url}</small></h4><hr />' . __( 'Pre-populate the field with the current page URL that the user is on when opting in to your mailing list.', 'yikes-inc-easy-mailchimp-extender' ),
 							'title' => __( 'Page URL', 'yikes-inc-easy-mailchimp-extender' )
 						),
 						array(
 							'tag' => '{blog_name}',
-							'description' => '<h4 class="tooltip-title">' . __( 'Blog Name', 'yikes-inc-easy-mailchimp-extender' ) . ' | <small>{blog_name}</small></h4><hr />' . __( 'Pre-populate the field with the current blog name that the user is on when opting in to your mailing list. This is especially helpful for multi-site networks.' , 'yikes-inc-easy-mailchimp-extender' ),
+							'description' => '<h4 class="tooltip-title">' . __( 'Blog Name', 'yikes-inc-easy-mailchimp-extender' ) . ' | <small>{blog_name}</small></h4><hr />' . __( 'Pre-populate the field with the current blog name that the user is on when opting in to your mailing list. This is especially helpful for multi-site networks.', 'yikes-inc-easy-mailchimp-extender' ),
 							'title' => __( 'Blog Name', 'yikes-inc-easy-mailchimp-extender' )
 						),
 						array(
 							'tag' => '{user_logged_in}',
-							'description' => '<h4 class="tooltip-title">' . __( 'User Logged In', 'yikes-inc-easy-mailchimp-extender' ) . ' | <small>{user_logged_in}</small></h4><hr />' . __( 'Detects if a user is logged in and pre-populates the field with an appropriate value.' , 'yikes-inc-easy-mailchimp-extender' ),
+							'description' => '<h4 class="tooltip-title">' . __( 'User Logged In', 'yikes-inc-easy-mailchimp-extender' ) . ' | <small>{user_logged_in}</small></h4><hr />' . __( 'Detects if a user is logged in and pre-populates the field with an appropriate value.', 'yikes-inc-easy-mailchimp-extender' ),
 							'title' => __( 'User Logged In', 'yikes-inc-easy-mailchimp-extender' )
 						),
 					);
@@ -2244,17 +2244,17 @@ 
 				<div id="pre-defined-tag-container">
 					<input type="hidden" value="" class="clicked-input">
 					<div id="pre-defined-tag-interior-container">
-						<h3><?php _e( 'Pre Defined Tags' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
-						<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>
+						<h3><?php _e( 'Pre Defined Tags', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
+						<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>
 						<ul>
-							<?php foreach( apply_filters( 'yikes-mailchimp-custom-default-value-tags' , $available_tags ) as $tag ) { ?>
+							<?php foreach ( apply_filters( 'yikes-mailchimp-custom-default-value-tags', $available_tags ) as $tag ) { ?>
 								<li class="tooltop-tag">
 									<!-- link/tag -->
-									<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>
+									<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>
 									<!-- help icon -->
 									<span class="dashicons dashicons-editor-help"></span>
 									<!-- tooltip -->
-									<div class="tooltiptext qtip-bootstrap yikes-easy-mc-hidden"><?php echo $tag['description']; ?></div>
+									<div class="tooltiptext qtip-bootstrap yikes-easy-mc-hidden"><?php echo $tag[ 'description' ]; ?></div>
 								</li>
 							<?php } ?>
 						</ul>
@@ -2270,32 +2270,32 @@ 
 		*	-
 		* @parameters - $list_id - pass in the list ID to retreive merge variables from
 		*/
-		public function build_available_merge_vars( $form_fields , $available_merge_variables ) {
+		public function build_available_merge_vars( $form_fields, $available_merge_variables ) {
 			$fields_assigned_to_form = array();
-			if( !empty( $form_fields ) ) {
-				foreach( $form_fields as $assigned_field ) {
+			if ( ! empty( $form_fields ) ) {
+				foreach ( $form_fields as $assigned_field ) {
 					// print_r( $assigned_field) ;
 					// switch between merge variables and interest groups
-					if( isset( $assigned_field['merge'] ) ) {
-						$fields_assigned_to_form[] = $assigned_field['merge'];
+					if ( isset( $assigned_field[ 'merge' ] ) ) {
+						$fields_assigned_to_form[ ] = $assigned_field[ 'merge' ];
 					}
 				}
 			}
-			if( !empty( $available_merge_variables['data'][0] ) ) {
+			if ( ! empty( $available_merge_variables[ 'data' ][ 0 ] ) ) {
 				?><ul id="available-fields"><?php
-				foreach( $available_merge_variables['data'][0]['merge_vars'] as $merge_var ) {
-					if( in_array( $merge_var['tag'] , $fields_assigned_to_form ) ) {
+				foreach ( $available_merge_variables[ 'data' ][ 0 ][ 'merge_vars' ] as $merge_var ) {
+					if ( in_array( $merge_var[ 'tag' ], $fields_assigned_to_form ) ) {
 						?>
-							<li class="available-form-field not-available" alt="<?php echo $merge_var['tag']; ?>" data-attr-field-type="<?php echo $merge_var['field_type']; ?>" data-attr-field-name="<?php echo $merge_var['name']; ?>" data-attr-form-id="<?php echo $available_merge_variables['data'][0]['id']; ?>" title="<?php _e( 'Already assigned to your form' , 'yikes-inc-easy-mailchimp-extender' ); ?>" disabled="disabled"><?php echo stripslashes( $merge_var['name'] ); if( $merge_var['req'] == '1' ) { echo ' <span class="field-required" title="' . __( 'required field' , 'yikes-inc-easy-mailchimp-extender' ) . '">*</span>'; } ?> <small class="field-type-text"><?php echo $merge_var['field_type']; ?></small></li>
+							<li class="available-form-field not-available" alt="<?php echo $merge_var[ 'tag' ]; ?>" data-attr-field-type="<?php echo $merge_var[ 'field_type' ]; ?>" data-attr-field-name="<?php echo $merge_var[ 'name' ]; ?>" data-attr-form-id="<?php echo $available_merge_variables[ 'data' ][ 0 ][ 'id' ]; ?>" title="<?php _e( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ); ?>" disabled="disabled"><?php echo stripslashes( $merge_var[ 'name' ] ); if ( $merge_var[ 'req' ] == '1' ) { echo ' <span class="field-required" title="' . __( 'required field', 'yikes-inc-easy-mailchimp-extender' ) . '">*</span>'; } ?> <small class="field-type-text"><?php echo $merge_var[ 'field_type' ]; ?></small></li>
 						<?php
 					} else {
 						?>
-							<li class="available-form-field" alt="<?php echo $merge_var['tag']; ?>" data-attr-field-type="<?php echo $merge_var['field_type']; ?>" data-attr-field-name="<?php echo $merge_var['name']; ?>" data-attr-form-id="<?php echo $available_merge_variables['data'][0]['id']; ?>"><?php echo stripslashes( $merge_var['name'] ); if( $merge_var['req'] == '1' ) { echo ' <span class="field-required" title="' . __( 'required field' , 'yikes-inc-easy-mailchimp-extender' ) . '">*</span>'; } ?> <small class="field-type-text"><?php echo $merge_var['field_type']; ?></small></li>
+							<li class="available-form-field" alt="<?php echo $merge_var[ 'tag' ]; ?>" data-attr-field-type="<?php echo $merge_var[ 'field_type' ]; ?>" data-attr-field-name="<?php echo $merge_var[ 'name' ]; ?>" data-attr-form-id="<?php echo $available_merge_variables[ 'data' ][ 0 ][ 'id' ]; ?>"><?php echo stripslashes( $merge_var[ 'name' ] ); if ( $merge_var[ 'req' ] == '1' ) { echo ' <span class="field-required" title="' . __( 'required field', 'yikes-inc-easy-mailchimp-extender' ) . '">*</span>'; } ?> <small class="field-type-text"><?php echo $merge_var[ 'field_type' ]; ?></small></li>
 						<?php
 					}
 				}
 				?></ul>
-				<a href="#" class="add-field-to-editor button-secondary yikes-easy-mc-hidden" style="display:none;"><small><span class="dashicons dashicons-arrow-left-alt add-to-form-builder-arrow"></span> <?php _e( 'Add to Form Builder' , 'yikes-inc-easy-mailchimp-extender' ); ?></small></a>
+				<a href="#" class="add-field-to-editor button-secondary yikes-easy-mc-hidden" style="display:none;"><small><span class="dashicons dashicons-arrow-left-alt add-to-form-builder-arrow"></span> <?php _e( 'Add to Form Builder', 'yikes-inc-easy-mailchimp-extender' ); ?></small></a>
 				<?php
 			}
 		}
@@ -2307,30 +2307,30 @@ 
 		*	-
 		* @parameters - $list_id - pass in the list ID to retreive merge variables from
 		*/
-		public function build_available_interest_groups( $form_fields , $available_interest_groups , $list_id ) {
+		public function build_available_interest_groups( $form_fields, $available_interest_groups, $list_id ) {
 			$fields_assigned_to_form = array();
-			if( !empty( $form_fields ) ) {
-					foreach( $form_fields as $assigned_interest_group ) {
-					if( isset( $assigned_interest_group['group_id'] ) ) {
-						$fields_assigned_to_form[] = $assigned_interest_group['group_id'];
+			if ( ! empty( $form_fields ) ) {
+					foreach ( $form_fields as $assigned_interest_group ) {
+					if ( isset( $assigned_interest_group[ 'group_id' ] ) ) {
+						$fields_assigned_to_form[ ] = $assigned_interest_group[ 'group_id' ];
 					}
 				}
 			}
-			if( !empty( $available_interest_groups) ) {
+			if ( ! empty( $available_interest_groups ) ) {
 				?><ul id="available-interest-groups"><?php
-				foreach( $available_interest_groups as $interest_group ) {
-					if( in_array( $interest_group['id'] , $fields_assigned_to_form ) ) {
+				foreach ( $available_interest_groups as $interest_group ) {
+					if ( in_array( $interest_group[ 'id' ], $fields_assigned_to_form ) ) {
 						?>
-							<li class="available-interest-group not-available" alt="<?php echo $interest_group['id']; ?>" data-attr-field-name="<?php echo stripslashes( $interest_group['name'] ); ?>" data-attr-field-type="<?php echo $interest_group['form_field']; ?>" data-attr-form-id="<?php echo $list_id; ?>" title="<?php _e( 'Already assigned to your form' , 'yikes-inc-easy-mailchimp-extender' ); ?>" disabled="disabled"><?php echo stripslashes( $interest_group['name'] ); ?> <small class="field-type-text"><?php echo $interest_group['form_field']; ?></small></li>
+							<li class="available-interest-group not-available" alt="<?php echo $interest_group[ 'id' ]; ?>" data-attr-field-name="<?php echo stripslashes( $interest_group[ 'name' ] ); ?>" data-attr-field-type="<?php echo $interest_group[ 'form_field' ]; ?>" data-attr-form-id="<?php echo $list_id; ?>" title="<?php _e( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ); ?>" disabled="disabled"><?php echo stripslashes( $interest_group[ 'name' ] ); ?> <small class="field-type-text"><?php echo $interest_group[ 'form_field' ]; ?></small></li>
 						<?php
 					} else {
 						?>
-							<li class="available-interest-group" alt="<?php echo $interest_group['id']; ?>" data-attr-field-name="<?php echo stripslashes( $interest_group['name'] ); ?>" data-attr-field-type="<?php echo $interest_group['form_field']; ?>" data-attr-form-id="<?php echo $list_id; ?>"><?php echo stripslashes( $interest_group['name'] ); ?> <small class="field-type-text"><?php echo $interest_group['form_field']; ?></small></li>
+							<li class="available-interest-group" alt="<?php echo $interest_group[ 'id' ]; ?>" data-attr-field-name="<?php echo stripslashes( $interest_group[ 'name' ] ); ?>" data-attr-field-type="<?php echo $interest_group[ 'form_field' ]; ?>" data-attr-form-id="<?php echo $list_id; ?>"><?php echo stripslashes( $interest_group[ 'name' ] ); ?> <small class="field-type-text"><?php echo $interest_group[ 'form_field' ]; ?></small></li>
 						<?php
 					}
 				}
 				?></ul>
-				<a href="#" class="add-interest-group-to-editor button-secondary yikes-easy-mc-hidden" style="display:none;"><small><span class="dashicons dashicons-arrow-left-alt add-to-form-builder-arrow"></span> <?php _e( 'Add to Form Builder' , 'yikes-inc-easy-mailchimp-extender' ); ?></small></a>
+				<a href="#" class="add-interest-group-to-editor button-secondary yikes-easy-mc-hidden" style="display:none;"><small><span class="dashicons dashicons-arrow-left-alt add-to-form-builder-arrow"></span> <?php _e( 'Add to Form Builder', 'yikes-inc-easy-mailchimp-extender' ); ?></small></a>
 				<?php
 			}
 		}
@@ -2342,9 +2342,9 @@ 
 		*	- must clean up db tables , ensure what data is going in and what is needed...
 		*/
 		public function yikes_easy_mailchimp_create_form() {
-			$nonce = $_REQUEST['nonce'];
-			if( ! wp_verify_nonce( $nonce, 'create_mailchimp_form' ) ) {
-				die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) );
+			$nonce = $_REQUEST[ 'nonce' ];
+			if ( ! wp_verify_nonce( $nonce, 'create_mailchimp_form' ) ) {
+				die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ) );
 			}
 			global $wpdb;
 				/* Default values */
@@ -2367,7 +2367,7 @@ 
 					)
 				);
 				// setup our default error message array
-				$error_settings= json_encode(
+				$error_settings = json_encode(
 					array(
 						'success' => '',
 						'general-error' => '',
@@ -2381,9 +2381,9 @@ 
 				$wpdb->insert(
 					$wpdb->prefix . 'yikes_easy_mc_forms',
 					array(
-						'list_id' => $_POST['associated-list'],
-						'form_name' => stripslashes( $_POST['form-name'] ),
-						'form_description' => stripslashes( $_POST['form-description'] ),
+						'list_id' => $_POST[ 'associated-list' ],
+						'form_name' => stripslashes( $_POST[ 'form-name' ] ),
+						'form_description' => stripslashes( $_POST[ 'form-description' ] ),
 						'fields' => '',
 						'custom_styles' => 0,
 						'custom_template' => 0,
@@ -2404,33 +2404,33 @@ 
 						'%s', // form description
 						'%s', // fields
 						'%s', // custom styles
-						'%d',	// custom template
-						'%d',	// send welcome email
-						'%s',	// redirect user
-						'%s',	// redirect page
-						'%s',	// submission
-						'%s',	// optin
+						'%d', // custom template
+						'%d', // send welcome email
+						'%s', // redirect user
+						'%s', // redirect page
+						'%s', // submission
+						'%s', // optin
 						'%s', // error
 						'%s', // custom notifications
-						'%d',	// impressions #
-						'%d',	// submissions #
+						'%d', // impressions #
+						'%d', // submissions #
 						'%s', // custom fields
 					)
 				);
 
 			// if an error occurs during the form creation process
-			if( $wpdb->insert_id == '0' ) {
+			if ( $wpdb->insert_id == '0' ) {
 				// write it to the error log
 				// if the form was not created successfully
-				if( get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+				if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 					require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 					$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-					$error_logging->yikes_easy_mailchimp_write_to_error_log( $wpdb->last_error , __( "Creating a new form" , 'yikes-inc-easy-mailchimp-extender' ) , __( "Forms" , 'yikes-inc-easy-mailchimp-extender' ) );
+					$error_logging->yikes_easy_mailchimp_write_to_error_log( $wpdb->last_error, __( "Creating a new form", 'yikes-inc-easy-mailchimp-extender' ), __( "Forms", 'yikes-inc-easy-mailchimp-extender' ) );
 				}
-				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&sql_error='.urlencode( $wpdb->last_error ) ) ) );
+				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&sql_error=' . urlencode( $wpdb->last_error ) ) ) );
 			} else {
 				// redirect the user to the new form edit page
-				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id='.$wpdb->insert_id ) ) );
+				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $wpdb->insert_id ) ) );
 			}
 			exit();
 			die();
@@ -2444,11 +2444,11 @@ 
 		*/
 		public function yikes_easy_mailchimp_delete_form() {
 			// grab & store our variables ( associated list & form name )
-			$nonce = $_REQUEST['nonce'];
-			$post_id_to_delete = $_REQUEST['mailchimp-form'];
+			$nonce = $_REQUEST[ 'nonce' ];
+			$post_id_to_delete = $_REQUEST[ 'mailchimp-form' ];
 			// verify our nonce
-			if( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-'.$post_id_to_delete ) ) {
-				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 ) );
+			if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-' . $post_id_to_delete ) ) {
+				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 ) );
 			}
 			global $wpdb;
 				/* Working Insert Function */
@@ -2473,39 +2473,39 @@ 
 		*/
 		public function yikes_easy_mailchimp_duplicate_form() {
 			// grab & store our variables ( associated list & form name )
-			$nonce = $_REQUEST['nonce'];
-			$post_id_to_clone = $_REQUEST['mailchimp-form'];
+			$nonce = $_REQUEST[ 'nonce' ];
+			$post_id_to_clone = $_REQUEST[ 'mailchimp-form' ];
 			// verify our nonce
-			if( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-'.$post_id_to_clone ) ) {
-				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 ) );
+			if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-' . $post_id_to_clone ) ) {
+				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 ) );
 			}
 			global $wpdb;
 				/* Working Insert Function */
-				$form_data = $wpdb->get_row("SELECT * FROM " . $wpdb->prefix . "yikes_easy_mc_forms WHERE id = ".$post_id_to_clone."");
+				$form_data = $wpdb->get_row( "SELECT * FROM " . $wpdb->prefix . "yikes_easy_mc_forms WHERE id = " . $post_id_to_clone . "" );
 				// create empty array to populate with row data
 				$data = array();
 				// build a data array to duplicate
-				foreach( $form_data as $id => $value ) {
+				foreach ( $form_data as $id => $value ) {
 					// skip the ID field this is unique
-					if( $id != 'id' ) {
+					if ( $id != 'id' ) {
 						// append -Copy- to our new form
-						if( $id == 'form_name' ) {
+						if ( $id == 'form_name' ) {
 							$value = $value . ' - Copy -';
 						}
 						// reset the impressions and submissions back to 0
-						if( $id == 'impressions' || $id == 'submissions' ) {
+						if ( $id == 'impressions' || $id == 'submissions' ) {
 							$value = '0';
 						}
 
 						// add data to our array
-						$data[$id] = $value;
+						$data[ $id ] = $value;
 					}
 				}
 				// insert our new data
-				if( $wpdb->insert(
+				if ( $wpdb->insert(
 					$wpdb->prefix . 'yikes_easy_mc_forms',
 					apply_filters( 'yikes-mailchimp-duplicate-form-data', $data )
-				)  === FALSE ) {
+				) === FALSE ) {
 					// redirect the user to the manage forms page, display error
 					wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&duplicated-form=false' ) ) );
 				} else {
@@ -2521,15 +2521,15 @@ 
 		*/
 		public function yikes_easy_mailchimp_reset_impression_stats() {
 			// grab & store our variables ( associated list & form name )
-			$nonce = $_REQUEST['nonce'];
-			$form_id_to_reset = $_REQUEST['mailchimp-form'];
+			$nonce = $_REQUEST[ 'nonce' ];
+			$form_id_to_reset = $_REQUEST[ 'mailchimp-form' ];
 			// verify our nonce
-			if( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-'.$form_id_to_reset ) ) {
-				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 ) );
+			if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-' . $form_id_to_reset ) ) {
+				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 ) );
 			}
 			global $wpdb;
 			/* Update 'Impressions/Submissions' */
-			if( $wpdb->update(
+			if ( $wpdb->update(
 				$wpdb->prefix . 'yikes_easy_mc_forms',
 				array(
 					'impressions' => 0,
@@ -2553,35 +2553,35 @@ 
 		*/
 		public function yikes_easy_mailchimp_update_form() {
 			// grab & store our variables ( associated list & form name )
-			$nonce = $_REQUEST['nonce'];
-			$form_id = $_REQUEST['id'];
+			$nonce = $_REQUEST[ 'nonce' ];
+			$form_id = $_REQUEST[ 'id' ];
 
 			// store our values!
-			$list_id = $_POST['associated-list'];
-			$form_name = stripslashes( $_POST['form-name'] );
-			$form_description = sanitize_text_field( stripslashes( $_POST['form-description'] ) );
-			$send_welcome_email = $_POST['send-welcome-email'];
-			$redirect_user_on_submit = $_POST['redirect-user-on-submission'];
-			$redirect_page = $_POST['redirect-user-to-selection'];
-			if( isset( $_POST['custom-styles'] ) ) {
-				$custom_styles = $_POST['custom-styles'];
+			$list_id = $_POST[ 'associated-list' ];
+			$form_name = stripslashes( $_POST[ 'form-name' ] );
+			$form_description = sanitize_text_field( stripslashes( $_POST[ 'form-description' ] ) );
+			$send_welcome_email = $_POST[ 'send-welcome-email' ];
+			$redirect_user_on_submit = $_POST[ 'redirect-user-on-submission' ];
+			$redirect_page = $_POST[ 'redirect-user-to-selection' ];
+			if ( isset( $_POST[ 'custom-styles' ] ) ) {
+				$custom_styles = $_POST[ 'custom-styles' ];
 			}
 
 			// stripslashes_deep on save, to prevent foreign languages from added excessive backslashes
-			$assigned_fields = isset( $_POST['field'] ) ? json_encode( stripslashes_deep( $_POST['field'] ) ) : '';
+			$assigned_fields = isset( $_POST[ 'field' ] ) ? json_encode( stripslashes_deep( $_POST[ 'field' ] ) ) : '';
 
 			// setup our custom styles serialized array
-			if( isset( $custom_styles ) ) {
+			if ( isset( $custom_styles ) ) {
 				$custom_styles = json_encode( array(
-					'active' => $_POST['custom-styles'],
-					'background_color' => $_POST['form-background-color'],
-					'font_color' => $_POST['form-font-color'],
-					'submit_button_color' => $_POST['form-submit-button-color'],
-					'submit_button_text_color' => $_POST['form-submit-button-text-color'],
-					'form_padding' => $_POST['form-padding'],
-					'form_width' => $_POST['form-width'],
-					'form_alignment' => $_POST['form-alignment'],
-					'label_visible' => $_POST['label-visible']
+					'active' => $_POST[ 'custom-styles' ],
+					'background_color' => $_POST[ 'form-background-color' ],
+					'font_color' => $_POST[ 'form-font-color' ],
+					'submit_button_color' => $_POST[ 'form-submit-button-color' ],
+					'submit_button_text_color' => $_POST[ 'form-submit-button-text-color' ],
+					'form_padding' => $_POST[ 'form-padding' ],
+					'form_width' => $_POST[ 'form-width' ],
+					'form_alignment' => $_POST[ 'form-alignment' ],
+					'label_visible' => $_POST[ 'label-visible' ]
 				) );
 			} else {
 				$custom_styles = 0;
@@ -2590,33 +2590,33 @@ 
 			// setup our submission settings serialized array
 			$submission_settings = json_encode(
 				array(
-					'ajax' => $_POST['form-ajax-submission'],
-					'redirect_on_submission' => $_POST['redirect-user-on-submission'],
-					'redirect_page' => $_POST['redirect-user-to-selection'],
-					'custom_redirect_url' => esc_url( $_POST['custom-redirect-url'] ),
-					'hide_form_post_signup' => $_POST['hide-form-post-signup'],
-					'replace_interests' => $_POST['replace-interest-groups'],
+					'ajax' => $_POST[ 'form-ajax-submission' ],
+					'redirect_on_submission' => $_POST[ 'redirect-user-on-submission' ],
+					'redirect_page' => $_POST[ 'redirect-user-to-selection' ],
+					'custom_redirect_url' => esc_url( $_POST[ 'custom-redirect-url' ] ),
+					'hide_form_post_signup' => $_POST[ 'hide-form-post-signup' ],
+					'replace_interests' => $_POST[ 'replace-interest-groups' ],
 				)
 			);
 
 			// setup our opt-in settings serialized array
 			$optin_settings = json_encode(
 				array(
-					'optin' => $_POST['single-double-optin'],
-					'update_existing_user' => $_POST['update-existing-user'],
-					'send_update_email' => $_POST['update-existing-email'],
-					'send_welcome_email' => $_POST['send-welcome-email'],
+					'optin' => $_POST[ 'single-double-optin' ],
+					'update_existing_user' => $_POST[ 'update-existing-user' ],
+					'send_update_email' => $_POST[ 'update-existing-email' ],
+					'send_welcome_email' => $_POST[ 'send-welcome-email' ],
 				)
 			);
 
 			// setup our error settings serialized array
 			$error_settings = json_encode(
 				array(
-					'success' => trim( $_POST['yikes-easy-mc-success-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-success-message'] ) ) : '',
-					'general-error' => trim( $_POST['yikes-easy-mc-general-error-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-general-error-message'] ) ) : '',
-					'invalid-email' => trim( $_POST['yikes-easy-mc-invalid-email-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-invalid-email-message'] ) ) : '',
-					'already-subscribed' => trim( $_POST['yikes-easy-mc-user-subscribed-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-subscribed-message'] ) ) : '',
-					'update-link' => trim( $_POST['yikes-easy-mc-user-update-link'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-update-link'] ) ) : '',
+					'success' => trim( $_POST[ 'yikes-easy-mc-success-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-success-message' ] ) ) : '',
+					'general-error' => trim( $_POST[ 'yikes-easy-mc-general-error-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-general-error-message' ] ) ) : '',
+					'invalid-email' => trim( $_POST[ 'yikes-easy-mc-invalid-email-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-invalid-email-message' ] ) ) : '',
+					'already-subscribed' => trim( $_POST[ 'yikes-easy-mc-user-subscribed-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-subscribed-message' ] ) ) : '',
+					'update-link' => trim( $_POST[ 'yikes-easy-mc-user-update-link' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-update-link' ] ) ) : '',
 				)
 			);
 
@@ -2625,33 +2625,33 @@ 
 			// To Do: Combine date & time so it's a single unix timestamp
 			$form_settings = json_encode(
 				array(
-					'yikes-easy-mc-form-class-names' => trim( $_POST['yikes-easy-mc-form-class-names'] ),
-					'yikes-easy-mc-inline-form' => $_POST['yikes-easy-mc-inline-form'][0],
-					'yikes-easy-mc-submit-button-type' => $_POST['yikes-easy-mc-submit-button-type'][0],
-					'yikes-easy-mc-submit-button-text' => trim( $_POST['yikes-easy-mc-submit-button-text'] ),
-					'yikes-easy-mc-submit-button-image' => esc_url( trim( $_POST['yikes-easy-mc-submit-button-image'] ) ),
-					'yikes-easy-mc-submit-button-classes' => trim( $_POST['yikes-easy-mc-submit-button-classes'] ),
-					'yikes-easy-mc-form-schedule' => ( isset( $_POST['yikes-easy-mc-form-schedule'] ) ) ? '1' : '0',
-					'yikes-easy-mc-form-restriction-start' => strtotime( $_POST['yikes-easy-mc-form-restriction-start-date'] . ' ' . $_POST['yikes-easy-mc-form-restriction-start-time'] ),
-					'yikes-easy-mc-form-restriction-end' => strtotime( $_POST['yikes-easy-mc-form-restriction-end-date'] . ' ' . $_POST['yikes-easy-mc-form-restriction-end-time'] ),
-					'yikes-easy-mc-form-restriction-pending-message' => trim( $_POST['yikes-easy-mc-form-restriction-pending-message'] ),
-					'yikes-easy-mc-form-restriction-expired-message' => trim( $_POST['yikes-easy-mc-form-restriction-expired-message'] ),
-					'yikes-easy-mc-form-login-required' => ( isset( $_POST['yikes-easy-mc-form-login-required'] ) ) ? '1' : '0',
-					'yikes-easy-mc-form-restriction-login-message' => trim( $_POST['yikes-easy-mc-form-restriction-login-message'] ),
+					'yikes-easy-mc-form-class-names' => trim( $_POST[ 'yikes-easy-mc-form-class-names' ] ),
+					'yikes-easy-mc-inline-form' => $_POST[ 'yikes-easy-mc-inline-form' ][ 0 ],
+					'yikes-easy-mc-submit-button-type' => $_POST[ 'yikes-easy-mc-submit-button-type' ][ 0 ],
+					'yikes-easy-mc-submit-button-text' => trim( $_POST[ 'yikes-easy-mc-submit-button-text' ] ),
+					'yikes-easy-mc-submit-button-image' => esc_url( trim( $_POST[ 'yikes-easy-mc-submit-button-image' ] ) ),
+					'yikes-easy-mc-submit-button-classes' => trim( $_POST[ 'yikes-easy-mc-submit-button-classes' ] ),
+					'yikes-easy-mc-form-schedule' => ( isset( $_POST[ 'yikes-easy-mc-form-schedule' ] ) ) ? '1' : '0',
+					'yikes-easy-mc-form-restriction-start' => strtotime( $_POST[ 'yikes-easy-mc-form-restriction-start-date' ] . ' ' . $_POST[ 'yikes-easy-mc-form-restriction-start-time' ] ),
+					'yikes-easy-mc-form-restriction-end' => strtotime( $_POST[ 'yikes-easy-mc-form-restriction-end-date' ] . ' ' . $_POST[ 'yikes-easy-mc-form-restriction-end-time' ] ),
+					'yikes-easy-mc-form-restriction-pending-message' => trim( $_POST[ 'yikes-easy-mc-form-restriction-pending-message' ] ),
+					'yikes-easy-mc-form-restriction-expired-message' => trim( $_POST[ 'yikes-easy-mc-form-restriction-expired-message' ] ),
+					'yikes-easy-mc-form-login-required' => ( isset( $_POST[ 'yikes-easy-mc-form-login-required' ] ) ) ? '1' : '0',
+					'yikes-easy-mc-form-restriction-login-message' => trim( $_POST[ 'yikes-easy-mc-form-restriction-login-message' ] ),
 				)
 			);
 
 			// setup and store our notification array
-			$custom_notifications = isset( $_POST['custom-notification'] ) ? stripslashes( json_encode( $_POST['custom-notification'] ) ) : '';
+			$custom_notifications = isset( $_POST[ 'custom-notification' ] ) ? stripslashes( json_encode( $_POST[ 'custom-notification' ] ) ) : '';
 
 			// additional custom fields (extensions / user defined fields)
-			if( isset( $_POST['custom-field'] ) ) {
+			if ( isset( $_POST[ 'custom-field' ] ) ) {
 				$custom_field_array = array();
-				foreach( $_POST['custom-field'] as $custom_field => $custom_value ) {
-					if( is_array( $custom_value ) ) {
-						$custom_field_array[$custom_field] = array_filter( stripslashes_deep( $custom_value ) ); // array_filters to remove empty items (don't save them!)
+				foreach ( $_POST[ 'custom-field' ] as $custom_field => $custom_value ) {
+					if ( is_array( $custom_value ) ) {
+						$custom_field_array[ $custom_field ] = array_filter( stripslashes_deep( $custom_value ) ); // array_filters to remove empty items (don't save them!)
 					} else {
-						$custom_field_array[$custom_field] = stripslashes( $custom_value );
+						$custom_field_array[ $custom_field ] = stripslashes( $custom_value );
 					}
 				}
 				$custom_fields = json_encode( $custom_field_array );
@@ -2660,8 +2660,8 @@ 
 			}
 
 			// verify our nonce
-			if( ! wp_verify_nonce( $nonce, 'update-mailchimp-form-'.$form_id ) ) {
-				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 ) );
+			if ( ! wp_verify_nonce( $nonce, 'update-mailchimp-form-' . $form_id ) ) {
+				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 ) );
 			}
 
 				global $wpdb;
@@ -2693,12 +2693,12 @@ 
 						'%s', // form description
 						'%s', // fields
 						'%s', // custom styles
-						'%d',	//custom template
-						'%d',	// send welcome email
-						'%s',	// redirect user
-						'%s',	// redirect page
-						'%s',	// submission
-						'%s',	// opt-in
+						'%d', //custom template
+						'%d', // send welcome email
+						'%s', // redirect user
+						'%s', // redirect page
+						'%s', // submission
+						'%s', // opt-in
 						'%s', // error
 						'%s', // custom notifications
 						'%s', // custom fields
@@ -2707,7 +2707,7 @@ 
 				);
 
 			/* Custom action hook which allows users to update specific options when a form is updated - used in add ons */
-			do_action( 'yikes-mailchimp-save-form', $form_id,  json_decode( $custom_fields, true ) );
+			do_action( 'yikes-mailchimp-save-form', $form_id, json_decode( $custom_fields, true ) );
 
 			// redirect the user to the manage forms page, display confirmation
 			wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $form_id . '&updated-form=true' ) ) );
@@ -2717,18 +2717,18 @@ 
 
 		/* Unsubscribe a given user from our list */
 		public function yikes_easy_mailchimp_unsubscribe_user() {
-			$nonce = $_REQUEST['nonce'];
-			$list_id = $_REQUEST['mailchimp-list'];
-			$email_id = $_REQUEST['email_id'];
+			$nonce = $_REQUEST[ 'nonce' ];
+			$list_id = $_REQUEST[ 'mailchimp-list' ];
+			$email_id = $_REQUEST[ 'email_id' ];
 			// verify our nonce
-			if( ! wp_verify_nonce( $nonce, 'unsubscribe-user-' . $email_id ) ) {
-				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 ) );
+			if ( ! wp_verify_nonce( $nonce, 'unsubscribe-user-' . $email_id ) ) {
+				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 ) );
 			}
 			// only re-run the API request if our API key has changed
 			// initialize MailChimp Class
-			$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
+			$api_key = trim( get_option( 'yikes-mc-api-key', '' ) );
 			$dash_position = strpos( $api_key, '-' );
-			if( $dash_position !== false ) {
+			if ( $dash_position !== false ) {
 				$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/unsubscribe.json';
 			}
 			$response = wp_remote_post( $api_endpoint, array(
@@ -2742,13 +2742,13 @@ 
 				'timeout' => 10,
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
-			if( ! is_wp_error( $response ) ) {
+			if ( ! is_wp_error( $response ) ) {
 				$response_body = json_decode( wp_remote_retrieve_body( $response ), true );
-				if( isset( $response_body['error'] ) ) {
-					if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+				if ( isset( $response_body[ 'error' ] ) ) {
+					if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 						require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 						$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-						$error_logging->yikes_easy_mailchimp_write_to_error_log( $response_body['error'], __( "Unsubscribe User" , 'yikes-inc-easy-mailchimp-extender' ) , __( "Manage List Page" , 'yikes-inc-easy-mailchimp-extender' ) );
+						$error_logging->yikes_easy_mailchimp_write_to_error_log( $response_body[ 'error' ], __( "Unsubscribe User", 'yikes-inc-easy-mailchimp-extender' ), __( "Manage List Page", 'yikes-inc-easy-mailchimp-extender' ) );
 					}
 				}
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-view-list&list-id=' . $list_id . '&user-unsubscribed=true' ) ) );
@@ -2759,21 +2759,21 @@ 
 
 		public function yikes_easy_mailchimp_create_missing_error_log() {
 			// grab our nonnce
-			$nonce = $_REQUEST['nonce'];
+			$nonce = $_REQUEST[ 'nonce' ];
 			// validate nonce
-			if( !wp_verify_nonce( $nonce, 'create_error_log' ) ) {
-				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 ) );
+			if ( ! wp_verify_nonce( $nonce, 'create_error_log' ) ) {
+				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 ) );
 			}
 			// setup the path to the error log
-			$error_log = fopen( plugin_dir_path( __FILE__ ) . '../includes/error_log/yikes-easy-mailchimp-error-log.php' , 'w' );
+			$error_log = fopen( plugin_dir_path( __FILE__ ) . '../includes/error_log/yikes-easy-mailchimp-error-log.php', 'w' );
 			try {
 				// create the file
-				fwrite( $error_log , '' );
+				fwrite( $error_log, '' );
 				// close out
 				fclose( $error_log );
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error_log_created=true' ) ) );
 			} catch ( Exception $e ) {
-				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() ) ) ) );
+				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() ) ) ) );
 			}
 		}
 
@@ -2784,16 +2784,16 @@ 
 		public function yikes_easy_mailchimp_clear_transient_data() {
 			$referer = wp_get_referer();
 			// grab & store our variables ( associated list & form name )
-			$nonce = $_REQUEST['nonce'];
+			$nonce = $_REQUEST[ 'nonce' ];
 			// verify our nonce
-			if( ! wp_verify_nonce( $nonce, 'clear-mc-transient-data' ) ) {
-				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 ) );
+			if ( ! wp_verify_nonce( $nonce, 'clear-mc-transient-data' ) ) {
+				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 ) );
 			}
 			// delete all of the integration settings list data in the cache
 			$list_ids = $this->get_mailchimp_list_ids_on_account();
 			// confirm the list IDs was returned and is not empty
-			if( isset( $list_ids ) && ! empty( $list_ids ) ) {
-				foreach( $list_ids as $id ) {
+			if ( isset( $list_ids ) && ! empty( $list_ids ) ) {
+				foreach ( $list_ids as $id ) {
 					// loop over each interest group and delete the transient associated with it
 					// this is created & stored on the integration list page
 					// id = groupID_interest_group
@@ -2825,13 +2825,13 @@ 
 		*	@return 	$list_id_array - array of list id's to loop over
 		*/
 		public function get_mailchimp_list_ids_on_account() {
-			$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
-			if( ! $api_key ) {
+			$api_key = trim( get_option( 'yikes-mc-api-key', '' ) );
+			if ( ! $api_key ) {
 				// if no api key is set/site is not connected, return an empty array
 				return array();
 			}
 			$dash_position = strpos( $api_key, '-' );
-			if( $dash_position !== false ) {
+			if ( $dash_position !== false ) {
 				$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/list.json';
 			}
 			$mailchimp_lists = wp_remote_post( $api_endpoint, array(
@@ -2842,19 +2842,19 @@ 
 				'timeout' => 10,
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
-			if( ! is_wp_error( $mailchimp_lists ) ) {
+			if ( ! is_wp_error( $mailchimp_lists ) ) {
 				$list_data = json_decode( wp_remote_retrieve_body( $mailchimp_lists ), true );
-				if( isset( $list_data['error'] ) ) {
-					if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+				if ( isset( $list_data[ 'error' ] ) ) {
+					if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 						require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 						$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-						$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data['error'], __( "Get List IDs" , 'yikes-inc-easy-mailchimp-extender' ) , __( "Clear API Cache" , 'yikes-inc-easy-mailchimp-extender' ) );
+						$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data[ 'error' ], __( "Get List IDs", 'yikes-inc-easy-mailchimp-extender' ), __( "Clear API Cache", 'yikes-inc-easy-mailchimp-extender' ) );
 					}
 				}
 				$mail_chimp_list_ids = array();
-				if( $mailchimp_lists ) {
-					foreach( $list_data as $list ) {
-						$mail_chimp_list_ids[] = $list['id'];
+				if ( $mailchimp_lists ) {
+					foreach ( $list_data as $list ) {
+						$mail_chimp_list_ids[ ] = $list[ 'id' ];
 					}
 					return $mail_chimp_list_ids;
 				} else {
@@ -2870,7 +2870,7 @@ 
 		*/
 		public function yikes_mailchimp_load_helper_class() {
 			// check to see if it's already loaded up
-			if( !class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {
+			if ( ! class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {
 				// Include our main helper class file
 				include_once( YIKES_MC_PATH . 'admin/partials/helpers/init.php' );
 			}
@@ -2947,7 +2947,7 @@ 
 		*	@since 6.0.4
 		*/
 		public function check_yikes_mc_table_version() {
-			if( get_option( 'yikes_mc_database_version', '0.00' ) < '1.0' ) {
+			if ( get_option( 'yikes_mc_database_version', '0.00' ) < '1.0' ) {
 				require_once YIKES_MC_PATH . 'includes/class-yikes-inc-easy-mailchimp-extender-activator.php';
 				global $wpdb;
 				Yikes_Inc_Easy_Mailchimp_Extender_Activator::_activate_yikes_easy_mailchimp( $wpdb );