yikesinc / yikes-inc-easy-mailchimp-extender

public/partials/shortcodes/yikes-mailchimp-subscriber-count.php

Spacing +4 added lines, -4 removed lines

@@ -26,8 +26,8 @@ 
 		return '';
 	}
 
-	$form    = ( ! empty( $attributes['form'] ) ) ? str_replace( '"', '', $attributes['form'] ) : false;
-	$list_id = ( ! empty( $attributes['list'] ) ) ? $attributes['list'] : false;
+	$form    = ( ! empty( $attributes[ 'form' ] ) ) ? str_replace( '"', '', $attributes[ 'form' ] ) : false;
+	$list_id = ( ! empty( $attributes[ 'list' ] ) ) ? $attributes[ 'list' ] : false;
 
 	/* If no list ID was passed into the shortcode - bail */
 	if ( ! $list_id && ! $form ) {
@@ -52,7 +52,7 @@ 
 			return '';
 		}
 
-		$list_id = sanitize_key( $form_data['list_id'] ); // associated list id (users who fill out the form will be subscribed to this list)
+		$list_id = sanitize_key( $form_data[ 'list_id' ] ); // associated list id (users who fill out the form will be subscribed to this list)
 	}
 
 	// object buffer
@@ -71,7 +71,7 @@ 
 	}
 
 	/* type cast the returned value as an integer */
-	echo (int) apply_filters( 'yikes-mailchimp-subscriber-count-value', $list_data['stats']['member_count'] );
+	echo (int) apply_filters( 'yikes-mailchimp-subscriber-count-value', $list_data[ 'stats' ][ 'member_count' ] );
 
 	return ob_get_clean();
 

admin/partials/menu/options.php

Spacing +24 added lines, -24 removed lines

@@ -5,13 +5,13 @@ 
 */
 
 	/* Get and Store Option Values */
-	if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) === 'valid_api_key' ) {
-		$api_connection = '<span id="connection-container" class="api-connected" title="' . __( "Your site is currently connected to the MailChimp API" , "yikes-inc-easy-mailchimp-extender" ) . '"><span class="dashicons dashicons-yes yikes-mc-api-connected"></span> ' . __( "Connected" , 'yikes-inc-easy-mailchimp-extender' ) . '</span>';
+	if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) === 'valid_api_key' ) {
+		$api_connection = '<span id="connection-container" class="api-connected" title="' . __( "Your site is currently connected to the MailChimp API", "yikes-inc-easy-mailchimp-extender" ) . '"><span class="dashicons dashicons-yes yikes-mc-api-connected"></span> ' . __( "Connected", 'yikes-inc-easy-mailchimp-extender' ) . '</span>';
 		$api_error_response = '';
 	} else {
-		$api_connection = '<span id="connection-container" class="api-not-connected"><span class="dashicons dashicons-no-alt yikes-mc-api-not-connected"></span>  ' . __( "Not Connected" , 'yikes-inc-easy-mailchimp-extender' ) . '</span>';
-		if( get_option( 'yikes-mc-api-invalid-key-response' , '' ) != '' ) {
-			$api_error_response = '<p><small><i class="dashicons dashicons-no-alt"></i> ' . get_option( 'yikes-mc-api-invalid-key-response' , '' ) . '</small></p>';
+		$api_connection = '<span id="connection-container" class="api-not-connected"><span class="dashicons dashicons-no-alt yikes-mc-api-not-connected"></span>  ' . __( "Not Connected", 'yikes-inc-easy-mailchimp-extender' ) . '</span>';
+		if ( get_option( 'yikes-mc-api-invalid-key-response', '' ) != '' ) {
+			$api_error_response = '<p><small><i class="dashicons dashicons-no-alt"></i> ' . get_option( 'yikes-mc-api-invalid-key-response', '' ) . '</small></p>';
 		} else {
 			$api_error_response = '';
 		}
@@ -23,8 +23,8 @@ 
 	* @since 6.2.2
 	*
 	*/
-	if ( isset( $_REQUEST['section'] ) ) {
-		$_REQUEST['section'] = preg_replace('/[^\w-]/', '', strip_tags ( $_REQUEST['section'] ) );
+	if ( isset( $_REQUEST[ 'section' ] ) ) {
+		$_REQUEST[ 'section' ] = preg_replace( '/[^\w-]/', '', strip_tags( $_REQUEST[ 'section' ] ) );
 	}
 ?>
 	<!-- Actual Settings Form
@@ -32,15 +32,15 @@ 
 	<div class="wrap">
 
 		<!-- Freddie Logo -->
-		<img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - MailChimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
+		<img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - MailChimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
 
-		<h1>Easy Forms for MailChimp | <?php if ( isset( $_REQUEST['section'] ) ) { echo ucwords( str_replace( '-', ' ', $_REQUEST['section'] ) ); } else { echo __( 'General Settings' , 'yikes-inc-easy-mailchimp-extender' ); } ?></h1>
+		<h1>Easy Forms for MailChimp | <?php if ( isset( $_REQUEST[ 'section' ] ) ) { echo ucwords( str_replace( '-', ' ', $_REQUEST[ 'section' ] ) ); } else { echo __( 'General Settings', 'yikes-inc-easy-mailchimp-extender' ); } ?></h1>
 
 		<!-- Settings Page Description -->
-		<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Manage the overall settings for Easy forms for MailChimp.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Manage the overall settings for Easy forms for MailChimp.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 		<?php
 			/* Success Messages on Options Updated */
-			if( isset( $_REQUEST['settings-updated'] ) && $_REQUEST['settings-updated'] == 'true' ) {
+			if ( isset( $_REQUEST[ 'settings-updated' ] ) && $_REQUEST[ 'settings-updated' ] == 'true' ) {
 				?>
 				<div class="updated manage-form-admin-notice">
 					<p><?php _e( 'Settings successfully updated.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -48,7 +48,7 @@ 
 				<?php
 			}
 			/* MailChimp API Cleared Successfully message */
-			if( isset( $_REQUEST['transient-cleared'] ) && $_REQUEST['transient-cleared'] == 'true' ) {
+			if ( isset( $_REQUEST[ 'transient-cleared' ] ) && $_REQUEST[ 'transient-cleared' ] == 'true' ) {
 				?>
 				<div class="updated manage-form-admin-notice">
 					<p><?php _e( 'MailChimp API Cache successfully cleared.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -57,7 +57,7 @@ 
 			}
 			/* Error Log Clear Messages */
 				/* Success Messages on Options Updated */
-				if( isset( $_REQUEST['error-log-cleared'] ) && $_REQUEST['error-log-cleared'] == 'true' ) {
+				if ( isset( $_REQUEST[ 'error-log-cleared' ] ) && $_REQUEST[ 'error-log-cleared' ] == 'true' ) {
 					?>
 					<div class="updated manage-form-admin-notice">
 						<p><?php _e( 'Error log successfully cleared.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -65,7 +65,7 @@ 
 					<?php
 				}
 				/* MailChimp API Cleared Successfully message */
-				if( isset( $_REQUEST['error-log-cleared'] ) && $_REQUEST['error-log-cleared'] == 'false' ) {
+				if ( isset( $_REQUEST[ 'error-log-cleared' ] ) && $_REQUEST[ 'error-log-cleared' ] == 'false' ) {
 					?>
 					<div class="error manage-form-admin-notice">
 						<p><?php _e( "Whoops! We've encountered an error while trying to clear the error log. Please refresh the page and try again. If the error persists please get in touch with the YIKES Inc. support team.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -74,28 +74,28 @@ 
 				}
 
 				/* Display a success message if our error log was sucessfully created, or display an error if not */
-				if( isset( $_GET['error_log_created'] ) && $_GET['error_log_created'] == 'true' ) {
+				if ( isset( $_GET[ 'error_log_created' ] ) && $_GET[ 'error_log_created' ] == 'true' ) {
 					?>
 					<div class="updated">
 						<p><?php _e( 'Error log successfully created. You may now start logging errors.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 					</div>
 					<?php
-				} else if( isset( $_GET['error_log_created'] ) && $_GET['error_log_created'] == 'false' ) {
+				} else if ( isset( $_GET[ 'error_log_created' ] ) && $_GET[ 'error_log_created' ] == 'false' ) {
 					?>
 					<div class="error">
-						<p><?php echo esc_attr( urldecode( $_GET['error_message'] ) , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+						<p><?php echo esc_attr( urldecode( $_GET[ 'error_message' ] ), 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 					</div>
 					<?php
 				}
 
 				/* Display a success message if the user successfully imported some forms */
-				if( isset( $_GET['section'] ) && $_GET['section'] == 'import-export-forms' && isset( $_GET['import-forms'] ) && $_GET['import-forms'] == 'true' ) {
+				if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'import-export-forms' && isset( $_GET[ 'import-forms' ] ) && $_GET[ 'import-forms' ] == 'true' ) {
 					?>
 					<div class="updated">
 						<p><?php printf( __( 'Opt-in forms successfully imported. <a href="%s" title="View Forms">View Forms</a>', 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?></p>
 					</div>
 					<?php
-				} elseif( isset( $_GET['section'] ) && $_GET['section'] == 'import-export-forms' && isset( $_GET['import-settings'] ) && $_GET['import-settings'] == 'true' ) {
+				} elseif ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'import-export-forms' && isset( $_GET[ 'import-settings' ] ) && $_GET[ 'import-settings' ] == 'true' ) {
 					?>
 					<div class="updated">
 						<p><?php printf( __( 'YIKES Easy Forms for MailChimp settings successfully imported.', 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?></p>
@@ -116,11 +116,11 @@ 
 
 						<div class="postbox yikes-easy-mc-postbox">
 
-							<?php if( !isset( $_REQUEST['section'] ) || $_REQUEST['section'] == '' ) {
+							<?php if ( ! isset( $_REQUEST[ 'section' ] ) || $_REQUEST[ 'section' ] == '' ) {
 								include YIKES_MC_PATH . 'admin/partials/menu/options-sections/general-settings.php';
 							} else {
-								if( isset( $_REQUEST['addon'] ) && $_REQUEST['addon'] == 'true' ) {
-									include apply_filters( 'yikes-mailchimp-'.$_REQUEST['section'].'-options-path' , '' );
+								if ( isset( $_REQUEST[ 'addon' ] ) && $_REQUEST[ 'addon' ] == 'true' ) {
+									include apply_filters( 'yikes-mailchimp-' . $_REQUEST[ 'section' ] . '-options-path', '' );
 								} else {
 									// White list a set of files that are allowed to be included here
 									$file_base = 'admin/partials/menu/options-sections/';
@@ -133,8 +133,8 @@ 
 										$file_base . 'recaptcha-settings.php',
 									);
 									// Ensure the included file is allowed and whitelisted above, before including it
-									if ( 0 === validate_file( 'admin/partials/menu/options-sections/' . $_REQUEST['section'] . '.php', $acceptable_files ) ) {
-										include YIKES_MC_PATH . 'admin/partials/menu/options-sections/' . $_REQUEST['section'] . '.php';
+									if ( 0 === validate_file( 'admin/partials/menu/options-sections/' . $_REQUEST[ 'section' ] . '.php', $acceptable_files ) ) {
+										include YIKES_MC_PATH . 'admin/partials/menu/options-sections/' . $_REQUEST[ 'section' ] . '.php';
 									} else {
 										wp_die( esc_attr__( 'Invalid file. If this error persists, please contact support.', 'yikes-inc-easy-mailchimp' ) );
 									}

admin/partials/menu/add-ons.php

Spacing +3 added lines, -3 removed lines

@@ -7,12 +7,12 @@
 <div class="wrap">
 
 	<!-- Freddie Logo -->
-	<img src="<?php echo esc_url( YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png' ); ?>" alt="<?php esc_attr_e( 'Freddie - MailChimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
+	<img src="<?php echo esc_url( YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png' ); ?>" alt="<?php esc_attr_e( 'Freddie - MailChimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
 
-	<h1>Easy Forms for MailChimp | <?php echo esc_attr__( 'Add-Ons' , 'yikes-inc-easy-mailchimp-extender' ); ?> &nbsp; <a href="https://yikesplugins.com/plugins/?plugins=MailChimp" target="_blank" class="button-primary coming-soon-button" title="<?php esc_attr_e( 'View All Add-Ons' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php esc_attr_e( 'View All Add-Ons' , 'yikes-inc-easy-mailchimp-extender' ); ?> <span class="dashicons dashicons-external"></span></a></h1>
+	<h1>Easy Forms for MailChimp | <?php echo esc_attr__( 'Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?> &nbsp; <a href="https://yikesplugins.com/plugins/?plugins=MailChimp" target="_blank" class="button-primary coming-soon-button" title="<?php esc_attr_e( 'View All Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php esc_attr_e( 'View All Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?> <span class="dashicons dashicons-external"></span></a></h1>
 
 	<!-- Addons Page Description -->
-	<p class="yikes-easy-mc-about-text about-text"><?php esc_attr_e( "Below you'll find all free and paid add-ons available for Easy Forms for MailChimp. Each add-on extends the functionality of the free plugin." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+	<p class="yikes-easy-mc-about-text about-text"><?php esc_attr_e( "Below you'll find all free and paid add-ons available for Easy Forms for MailChimp. Each add-on extends the functionality of the free plugin.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
 	<!-- Add-On Container -->
 	<section id="add-ons">

includes/api/class-yikes-inc-easy-mailchimp-api-abstract-items.php

Spacing +11 added lines, -11 removed lines

@@ -79,8 +79,8 @@ 
 			}
 
 			// If the API gave an error or there are no more lists, break.
-			if ( isset( $response['error'] ) ) {
-				return new WP_Error( $response['title'], $response['detail'] );
+			if ( isset( $response[ 'error' ] ) ) {
+				return new WP_Error( $response[ 'title' ], $response[ 'detail' ] );
 			}
 
 			if ( empty( $response[ $item_key ] ) ) {
@@ -89,7 +89,7 @@ 
 
 			// Update the total number of items if it's still zero.
 			if ( 0 === $total ) {
-				$total = intval( $response['total_items'] );
+				$total = intval( $response[ 'total_items' ] );
 			}
 
 			// Store each new list.
@@ -196,16 +196,16 @@ 
 			return $response;
 		}
 
-		if ( isset( $response['error'] ) ) {
-			$title  = isset( $response['title'] )  ? $response['title']  : $response['name'];
-			$detail = isset( $response['detail'] ) ? $response['detail'] : $response['error'];
-			$data   = isset( $response['errors'] ) ? $response['errors'] : array();
+		if ( isset( $response[ 'error' ] ) ) {
+			$title  = isset( $response[ 'title' ] ) ? $response[ 'title' ] : $response[ 'name' ];
+			$detail = isset( $response[ 'detail' ] ) ? $response[ 'detail' ] : $response[ 'error' ];
+			$data   = isset( $response[ 'errors' ] ) ? $response[ 'errors' ] : array();
 
 			return new WP_Error(
 				$title,
 				$detail,
 				array(
-					'status' => (int) $response['status'],
+					'status' => (int) $response[ 'status' ],
 					'data'   => $data,
 				)
 			);
@@ -234,9 +234,9 @@ 
 
 		// MailChimp uses the application/problem+json type for errors
 		$headers = wp_remote_retrieve_headers( $response );
-		if ( isset( $headers['content-type'] ) ) {
-			if ( false !== strpos( $headers['content-type'], 'application/problem+json' ) ) {
-				$body['error'] = true;
+		if ( isset( $headers[ 'content-type' ] ) ) {
+			if ( false !== strpos( $headers[ 'content-type' ], 'application/problem+json' ) ) {
+				$body[ 'error' ] = true;
 			}
 		}
 

includes/api/class-yikes-inc-easy-mailchimp-api.php

Spacing +9 added lines, -9 removed lines

@@ -103,7 +103,7 @@ 
 	 * @return array|WP_Error
 	 */
 	public function patch( $path = '', $headers = array(), $params = array() ) {
-		if ( ! isset( $params['body'] ) ) {
+		if ( ! isset( $params[ 'body' ] ) ) {
 			return new WP_Error(
 				'yikesinc_eme_missing_body',
 				sprintf(
@@ -130,7 +130,7 @@ 
 	 * @return array|WP_Error
 	 */
 	public function post( $path = '', $headers = array(), $params = array() ) {
-		if ( ! isset( $params['body'] ) ) {
+		if ( ! isset( $params[ 'body' ] ) ) {
 			return new WP_Error(
 				'yikesinc_eme_missing_body',
 				sprintf(
@@ -157,7 +157,7 @@ 
 	 * @return array|WP_Error
 	 */
 	public function put( $path = '', $headers = array(), $params = array() ) {
-		if ( ! isset( $params['body'] ) ) {
+		if ( ! isset( $params[ 'body' ] ) ) {
 			return new WP_Error(
 				'yikesinc_eme_missing_body',
 				sprintf(
@@ -288,13 +288,13 @@ 
 		$authorized_args = $this->get_authorized_args();
 
 		// If we have body data, maybe convert it to JSON.
-		if ( isset( $params['body'] ) && ( is_array( $params['body'] ) || is_object( $params['body'] ) ) ) {
-			$params['body']          = json_encode( wp_parse_args( $authorized_args['body'], $params['body'] ) );
-			$headers['Content-Type'] = 'application/json';
+		if ( isset( $params[ 'body' ] ) && ( is_array( $params[ 'body' ] ) || is_object( $params[ 'body' ] ) ) ) {
+			$params[ 'body' ]          = json_encode( wp_parse_args( $authorized_args[ 'body' ], $params[ 'body' ] ) );
+			$headers[ 'Content-Type' ] = 'application/json';
 		}
 
 		// Combine the given headers and auth headers
-		$headers = wp_parse_args( $authorized_args['headers'], $headers );
+		$headers = wp_parse_args( $authorized_args[ 'headers' ], $headers );
 		/**
 		 * Filter the headers used for a request to the MailChimp API.
 		 *
@@ -358,12 +358,12 @@ 
 
 		// Version 2.0 uses body authorization
 		if ( version_compare( '3.0', $this->api_version, '>' ) ) {
-			$args['body'] = $this->get_auth_body();
+			$args[ 'body' ] = $this->get_auth_body();
 		}
 
 		// Version 3.0 uses authorization headers.
 		if ( version_compare( '3.0', $this->api_version, '<=' ) ) {
-			$args['headers'] = $this->get_auth_headers();
+			$args[ 'headers' ] = $this->get_auth_headers();
 		}
 
 		return $args;

includes/class-yikes-inc-easy-mailchimp-extender-activator.php

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
 			if ( $network_wide ) {

 				$old_blog = $wpdb->blogid;

 				// Get all blog ids

-				$blogids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");

+				$blogids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );

 				foreach ( $blogids as $blog_id ) {

 					switch_to_blog( $blog_id );

 					self::_activate_yikes_easy_mailchimp( $wpdb );

@@ -90,8 +90,8 @@ 
 		custom_fields TEXT NOT NULL,

 		UNIQUE KEY id (id)

 		) $charset_collate;";

-		require_once(ABSPATH . 'wp-admin/includes/upgrade.php');

-		dbDelta($sql);

+		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );

+		dbDelta( $sql );

 

 		// create an option for the date that the user initially activated the plugin

 		// used to display a two week notice, asking for a review or to upgrade

includes/third-party-integrations/visual-composer/visual-composer.php

Spacing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
 		if ( ! empty( $all_forms ) ) {

 			// build an array to pass to our javascript

 			foreach ( $all_forms as $id => $form ) {

-				$lists[ $form['form_name'] ] = $id;

+				$lists[ $form[ 'form_name' ] ] = $id;

 			}

 		} else {

 			$lists[ __( 'Please Import Some MailChimp Lists', 'yikes-inc-easy-mailchimp-extender' ) ] = '-';

includes/class-yikes-inc-easy-mailchimp-extender-loader.php

Spacing +3 added lines, -3 removed lines

@@ -86,7 +86,7 @@ 
 	 * @return   type                                   The collection of actions and filters registered with WordPress.

 	 */

 	private function add( $hooks, $hook, $component, $callback, $priority, $accepted_args ) {

-		$hooks[] = array(

+		$hooks[ ] = array(

 			'hook'          => $hook,

 			'component'     => $component,

 			'callback'      => $callback,

@@ -102,10 +102,10 @@ 
 	 */

 	public function run() {

 		foreach ( $this->filters as $hook ) {

-			add_filter( $hook['hook'], array( $hook['component'], $hook['callback'] ), $hook['priority'], $hook['accepted_args'] );

+			add_filter( $hook[ 'hook' ], array( $hook[ 'component' ], $hook[ 'callback' ] ), $hook[ 'priority' ], $hook[ 'accepted_args' ] );

 		}

 		foreach ( $this->actions as $hook ) {

-			add_action( $hook['hook'], array( $hook['component'], $hook['callback'] ), $hook['priority'], $hook['accepted_args'] );

+			add_action( $hook[ 'hook' ], array( $hook[ 'component' ], $hook[ 'callback' ] ), $hook[ 'priority' ], $hook[ 'accepted_args' ] );

 		}

 	}

 }
\ No newline at end of file

admin/partials/upgrade-helpers/upgrade-migrate-options.php

Spacing +53 added lines, -53 removed lines

@@ -9,33 +9,33 @@ 
 	*/
 		
 	// enqueue the styles for our migration page..
-	wp_enqueue_style( 'yikes_mc_migrate_option_styles' , YIKES_MC_URL . 'admin/css/yikes-inc-easy-mailchimp-migrate-option-styles.css' );
-	wp_enqueue_style( 'animate-css' , YIKES_MC_URL . 'admin/css/animate.min.css' );
+	wp_enqueue_style( 'yikes_mc_migrate_option_styles', YIKES_MC_URL . 'admin/css/yikes-inc-easy-mailchimp-migrate-option-styles.css' );
+	wp_enqueue_style( 'animate-css', YIKES_MC_URL . 'admin/css/animate.min.css' );
 	
 	// store our old options
 	$old_plugin_options = get_option( 'ykseme_storage' );
 	
 	$global_error_messages = array(
-		'success' => __( $old_plugin_options['single-optin-message'] , 'yikes-inc-easy-mailchimp-extender' ),
-		'general-error' => __( "Whoops! It looks like something went wrong. Please try again." , 'yikes-inc-easy-mailchimp-extender' ),
-		'email-exists-error' => __( "The email you entered is already a subscriber to this list." , 'yikes-inc-easy-mailchimp-extender' ),
-		'success-single-optin' => __( 'Thank you for subscribing!' , 'yikes-inc-easy-mailchimp-extender' ),
+		'success' => __( $old_plugin_options[ 'single-optin-message' ], 'yikes-inc-easy-mailchimp-extender' ),
+		'general-error' => __( "Whoops! It looks like something went wrong. Please try again.", 'yikes-inc-easy-mailchimp-extender' ),
+		'email-exists-error' => __( "The email you entered is already a subscriber to this list.", 'yikes-inc-easy-mailchimp-extender' ),
+		'success-single-optin' => __( 'Thank you for subscribing!', 'yikes-inc-easy-mailchimp-extender' ),
 		'success-resubscribed' => __( 'Thank you for already being a subscriber! Your profile info has been updated.', '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' ),
 		'email-subject' => __( 'MailChimp Profile Update', 'yikes-inc-easy-mailchimp-extender' ),
 	);
 	
 	// if old options are defined...
-	if( $old_plugin_options ) {
+	if ( $old_plugin_options ) {
 		
 		// Verify the NONCE is valid
-		check_admin_referer( 'yikes-mc-migrate-options' , 'migrate_options_nonce' );
+		check_admin_referer( 'yikes-mc-migrate-options', 'migrate_options_nonce' );
 		
 		?>
 			
 		<div class="wrap" style="text-align:center;">
-			<h3><?php _e( 'Migrating old plugin options' , 'yikes-inc-easy-mailchimp-extender' ); ?><span class="upgrading-ellipse-one">.</span><span class="upgrading-ellipse-two">.</span><span class="upgrading-ellipse-three">.</h3>
-			<p><?php _e( 'please be patient while your options are updated and the process has completed' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+			<h3><?php _e( 'Migrating old plugin options', 'yikes-inc-easy-mailchimp-extender' ); ?><span class="upgrading-ellipse-one">.</span><span class="upgrading-ellipse-two">.</span><span class="upgrading-ellipse-three">.</h3>
+			<p><?php _e( 'please be patient while your options are updated and the process has completed', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 			<!-- empty list, populate when options  get updated -->
 			<ul id="options-updated" class="yikes-easy-mc-hidden">
 				<hr />
@@ -49,82 +49,82 @@ 
 				
 					// loop over our old options, and store them in a new option value
 					$do_not_migrate_options = array(
-						'ssl_verify_peer', 'api_validation' , 'widget_yikes_mc_widget' , 'flavor' , 'single-optin-message' , 'double-optin-message' ,
-						'mailchimp-optIn-default-list' , 'version' , 'yks-mailchimp-jquery-datepicker' , 'ssl_verify_peer' , 'optIn-checkbox' , 'yks-mailchimp-optin-checkbox-text',
-						'yks-mailchimp-required-text' , 'optin'
+						'ssl_verify_peer', 'api_validation', 'widget_yikes_mc_widget', 'flavor', 'single-optin-message', 'double-optin-message',
+						'mailchimp-optIn-default-list', 'version', 'yks-mailchimp-jquery-datepicker', 'ssl_verify_peer', 'optIn-checkbox', 'yks-mailchimp-optin-checkbox-text',
+						'yks-mailchimp-required-text', 'optin'
 					);
 							
-					foreach( $old_plugin_options as $option_name => $option_value ) {
+					foreach ( $old_plugin_options as $option_name => $option_value ) {
 												
-						if( ! in_array( $option_name , $do_not_migrate_options ) ) {
+						if ( ! in_array( $option_name, $do_not_migrate_options ) ) {
 							// ajax request to update our options one by one..
 							// if its an array, we need to json encode it
-							if( is_array( $option_value ) ) {
+							if ( is_array( $option_value ) ) {
 								
-								if( $option_name == 'lists' ) {
+								if ( $option_name == 'lists' ) {
 																	
-									if( ! empty( $option_value ) ) {
+									if ( ! empty( $option_value ) ) {
 										$settings = 1;
 										$form_length = count( $option_value );
-										foreach( $option_value as $mailchimp_form ) {
+										foreach ( $option_value as $mailchimp_form ) {
 											// update and pass our placeholder value
 											reset( $mailchimp_form );
-											$form_id = $mailchimp_form['id'];
+											$form_id = $mailchimp_form[ 'id' ];
 											
-											$fields = $mailchimp_form['fields'];	
+											$fields = $mailchimp_form[ 'fields' ];	
 											reset( $fields );
 											$first_field_key = key( $fields );
 											$array_keys = array_keys( $fields );
 											
 											$x = 1;								
 					
-											foreach( $array_keys as $parent_key ) {
+											foreach ( $array_keys as $parent_key ) {
 												
 												// alter the field keys so they show up after an import
 												$split_parent_key = explode( '-', $parent_key );
 
-												$new_parent_key = ( isset( $split_parent_key[1] ) ) ? strtoupper( $split_parent_key[1] ) : $parent_key;
+												$new_parent_key = ( isset( $split_parent_key[ 1 ] ) ) ? strtoupper( $split_parent_key[ 1 ] ) : $parent_key;
 
-												$mailchimp_form['fields'][$new_parent_key] = $mailchimp_form['fields'][$parent_key];
+												$mailchimp_form[ 'fields' ][ $new_parent_key ] = $mailchimp_form[ 'fields' ][ $parent_key ];
 
-												unset( $mailchimp_form['fields'][$parent_key] );			
+												unset( $mailchimp_form[ 'fields' ][ $parent_key ] );			
 										
 												// update our placeholder key to be 'placeholder'
-												$mailchimp_form['fields'][$new_parent_key]['placeholder'] = isset( $mailchimp_form['fields'][$new_parent_key]['placeholder-'.$form_id.'-'.$x] ) ? $mailchimp_form['fields'][$new_parent_key]['placeholder-'.$form_id.'-'.$x] : '';
+												$mailchimp_form[ 'fields' ][ $new_parent_key ][ 'placeholder' ] = isset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'placeholder-' . $form_id . '-' . $x ] ) ? $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'placeholder-' . $form_id . '-' . $x ] : '';
 												// update field classes
-												$mailchimp_form['fields'][$new_parent_key]['additional-classes'] = isset( $mailchimp_form['fields'][$new_parent_key]['custom-field-class-'.$form_id.'-'.$x] ) ? $mailchimp_form['fields'][$new_parent_key]['custom-field-class-'.$form_id.'-'.$x] : '';
+												$mailchimp_form[ 'fields' ][ $new_parent_key ][ 'additional-classes' ] = isset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'custom-field-class-' . $form_id . '-' . $x ] ) ? $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'custom-field-class-' . $form_id . '-' . $x ] : '';
 												// update help field - populate description
-												$mailchimp_form['fields'][$new_parent_key]['description'] = isset( $mailchimp_form['fields'][$new_parent_key]['help'] ) ? $mailchimp_form['fields'][$new_parent_key]['help'] : ''; 
+												$mailchimp_form[ 'fields' ][ $new_parent_key ][ 'description' ] = isset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'help' ] ) ? $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'help' ] : ''; 
 												// remove the old placeholder structure
-												unset( $mailchimp_form['fields'][$new_parent_key]['placeholder-'.$form_id.'-'.$x] );
+												unset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'placeholder-' . $form_id . '-' . $x ] );
 												// remove old custom class structure
-												unset( $mailchimp_form['fields'][$new_parent_key]['custom-field-class-'.$form_id.'-'.$x] );
+												unset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'custom-field-class-' . $form_id . '-' . $x ] );
 												// remove old help/description 
-												unset( $mailchimp_form['fields'][$new_parent_key]['help'] );
+												unset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'help' ] );
 																							
 												// check if choices is set, and encode them
-												if( isset( $mailchimp_form['fields'][$new_parent_key]['choices'] ) && ! empty( $mailchimp_form['fields'][$new_parent_key]['choices'] ) ) {
-													$mailchimp_form['fields'][$new_parent_key]['choices'] = addslashes( addslashes( json_encode( $mailchimp_form['fields'][$new_parent_key]['choices'] ) ) );
+												if ( isset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'choices' ] ) && ! empty( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'choices' ] ) ) {
+													$mailchimp_form[ 'fields' ][ $new_parent_key ][ 'choices' ] = addslashes( addslashes( json_encode( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'choices' ] ) ) );
 												}	
 
 												// update 'default' to 'default-choice' for radio/dropdown
-												if( isset( $mailchimp_form['fields'][$new_parent_key]['type'] ) && in_array( $mailchimp_form['fields'][$new_parent_key]['type'], array( 'radio', 'dropdown' ) ) ) {
-													$mailchimp_form['fields'][$new_parent_key]['default_choice'] = $mailchimp_form['fields'][$new_parent_key]['default'];
-													unset( $mailchimp_form['fields'][$new_parent_key]['default'] );
+												if ( isset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'type' ] ) && in_array( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'type' ], array( 'radio', 'dropdown' ) ) ) {
+													$mailchimp_form[ 'fields' ][ $new_parent_key ][ 'default_choice' ] = $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'default' ];
+													unset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'default' ] );
 												}
 												
 												// update 'date_format' on 'birthday' and 'date' fields
-												if( isset( $mailchimp_form['fields'][$new_parent_key]['type'] ) && in_array( $mailchimp_form['fields'][$new_parent_key]['type'], array( 'date', 'birthday' ) ) ) {
-													if( $mailchimp_form['fields'][$new_parent_key]['type'] == 'date' ) { // date
-														$mailchimp_form['fields'][$new_parent_key]['date_format'] = 'MM/DD'; // mailchimp default (can be altered)
+												if ( isset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'type' ] ) && in_array( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'type' ], array( 'date', 'birthday' ) ) ) {
+													if ( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'type' ] == 'date' ) { // date
+														$mailchimp_form[ 'fields' ][ $new_parent_key ][ 'date_format' ] = 'MM/DD'; // mailchimp default (can be altered)
 													} else { // birthday 
-														$mailchimp_form['fields'][$new_parent_key]['date_format'] = 'MM/DD/YYYY'; // mailchimp default (can be altered)
+														$mailchimp_form[ 'fields' ][ $new_parent_key ][ 'date_format' ] = 'MM/DD/YYYY'; // mailchimp default (can be altered)
 													}
 												}
 												
 												// update 'phone_format' on 'phone'
-												if( isset( $mailchimp_form['fields'][$new_parent_key]['type'] ) && in_array( $mailchimp_form['fields'][$new_parent_key]['type'], array( 'phone' ) ) ) {
-													$mailchimp_form['fields'][$new_parent_key]['phone_format'] = 'phone_format '; // phone format
+												if ( isset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'type' ] ) && in_array( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'type' ], array( 'phone' ) ) ) {
+													$mailchimp_form[ 'fields' ][ $new_parent_key ][ 'phone_format' ] = 'phone_format '; // phone format
 												}
 												
 												$x++;
@@ -141,7 +141,7 @@ 
 																								
 												$.post( ajaxurl, mc_data, function(response) {
 													jQuery( '#options-updated' ).show();
-													jQuery( '#options-updated' ).append( '<li class="animated fadeInDown"><?php echo '<strong>'; ?>' + response.form_name + '<?php echo '</strong> ' . __( "successfully imported." , 'yikes-inc-easy-mailchimp-extender' ); ?></li>' );	
+													jQuery( '#options-updated' ).append( '<li class="animated fadeInDown"><?php echo '<strong>'; ?>' + response.form_name + '<?php echo '</strong> ' . __( "successfully imported.", 'yikes-inc-easy-mailchimp-extender' ); ?></li>' );	
 													if( response.completed_import ) {
 														setTimeout( function() {
 															// finished with the loop...lets let the user know....and then redirect them....
@@ -150,13 +150,13 @@ 
 															jQuery( '.upgrading-ellipse-two' ).remove();
 															jQuery( '.upgrading-ellipse-three' ).remove();
 															jQuery( '.wrap' ).find( 'h3' ).next().fadeOut();
-															jQuery( '#options-updated' ).append( '<li class="animated fadeInDown migration-complete-notification"><em><?php _e( "Migration Complete. Please wait..." , 'yikes-inc-easy-mailchimp-extender' ); ?> </em> <img src="<?php echo esc_url_raw( admin_url( "images/wpspin_light.gif" ) ); ?>" /></li>' );
+															jQuery( '#options-updated' ).append( '<li class="animated fadeInDown migration-complete-notification"><em><?php _e( "Migration Complete. Please wait...", 'yikes-inc-easy-mailchimp-extender' ); ?> </em> <img src="<?php echo esc_url_raw( admin_url( "images/wpspin_light.gif" ) ); ?>" /></li>' );
 															// redirect our user to the main plugin page...
 															setTimeout( function() {
 																<?php 
 																	// migrate options that didnt make it (they were never stored in the 'ykseme_storage' options array)
-																	add_option( 'yikes-mc-api-validation' , get_option( 'api_validation' , 'invalid_api_key' ) );
-																	add_option( 'yikes-mc-error-messages' , $global_error_messages );
+																	add_option( 'yikes-mc-api-validation', get_option( 'api_validation', 'invalid_api_key' ) );
+																	add_option( 'yikes-mc-error-messages', $global_error_messages );
 																	// delete our old options after a successful migration (and some new ones that are no longer needed)
 																	delete_option( 'widget_yikes_mc_widget' );
 																	delete_option( 'api_validation' );
@@ -177,26 +177,26 @@ 
 							}
 							/* Rename our ReCaptcha Options */
 								/* Public Site Key */
-								if( $option_name == 'recaptcha-api-key' ) {
+								if ( $option_name == 'recaptcha-api-key' ) {
 									$option_name = 'recaptcha-site-key';
 								}
 								/* Private Key */
-								if( $option_name == 'recaptcha-private-api-key'  ) {
+								if ( $option_name == 'recaptcha-private-api-key' ) {
 									$option_name = 'recaptcha-secret-key';
 								}
 								/* Change 'recaptcha-setting' to 'recaptcha-status' */
 								/* Status */
-								if( $option_name == 'recaptcha-setting' ) {
+								if ( $option_name == 'recaptcha-setting' ) {
 									$option_name = 'recaptcha-status';
 								}
 							/* End  re-name ReCaptcha options */
 							
 
-							if( is_array( $option_value ) ) {
+							if ( is_array( $option_value ) ) {
 								$option_value = json_encode( $option_value );
 							}
 							// do noit migrate the lists option, it's not useful to us
-							if( $option_name != 'lists' ) {
+							if ( $option_name != 'lists' ) {
 								?>
 									var data = {
 										'action': 'migrate_old_plugin_settings',
@@ -206,7 +206,7 @@ 
 													
 									$.post( ajaxurl, data, function(response) {
 										jQuery( '#options-updated' ).show();
-										jQuery( '#options-updated' ).append( '<li class="animated fadeInDown"><?php echo '<strong>' . ucwords( str_replace( '_' , ' ' , str_replace( '-' , ' ' , $option_name ) ) ) . '</strong> ' . __( "successfully imported." , 'yikes-inc-easy-mailchimp-extender' ); ?></li>' );	
+										jQuery( '#options-updated' ).append( '<li class="animated fadeInDown"><?php echo '<strong>' . ucwords( str_replace( '_', ' ', str_replace( '-', ' ', $option_name ) ) ) . '</strong> ' . __( "successfully imported.", 'yikes-inc-easy-mailchimp-extender' ); ?></li>' );	
 									});
 								<?php
 								
@@ -230,7 +230,7 @@ 
 					}, 2000 );
 			</script>
 		<?php
-			wp_die( '<strong>' . __( 'Old plugin options do not exist. Redirecting you...' , 'yikes-inc-easy-mailchimp-extender' ) . '</strong>' , 500 );
+			wp_die( '<strong>' . __( 'Old plugin options do not exist. Redirecting you...', 'yikes-inc-easy-mailchimp-extender' ) . '</strong>', 500 );
 		?>
 		</div>
 		<?php