yikesinc / yikes-inc-easy-mailchimp-extender

public/classes/checkbox-integrations/class.easy_digital_downloads_checkout_form-checkbox.php

Spacing +16 added lines, -16 removed lines

@@ -7,7 +7,7 @@ 
 	*/
 	
 	// Prevent direct access to the file
-	defined('ABSPATH') or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!" , 'yikes-inc-easy-mailchimp-extender' ) );
+	defined( 'ABSPATH' ) or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!", 'yikes-inc-easy-mailchimp-extender' ) );
 
 	class Yikes_Easy_MC_EDD_Checkbox_Class extends Yikes_Easy_MC_Checkbox_Integration_Class {
 	
@@ -21,8 +21,8 @@ 
 		 */
 		public function __construct() {
 			add_action( 'edd_purchase_form_user_info_fields', array( $this, 'output_checkbox' ) );
-			add_action( 'edd_insert_payment', array( $this, 'update_payment_post_meta' ) , 99999 );
-			add_action( 'edd_complete_purchase', array( $this, 'subscribe_from_edd_purchase'), 50 );
+			add_action( 'edd_insert_payment', array( $this, 'update_payment_post_meta' ), 99999 );
+			add_action( 'edd_complete_purchase', array( $this, 'subscribe_from_edd_purchase' ), 50 );
 		}
 		
 		
@@ -30,13 +30,13 @@ 
 		* Outputs a checkbox
 		*/
 		public function output_checkbox() {
-			if( $this->is_user_already_subscribed( $this->type ) == '1' ) {
+			if ( $this->is_user_already_subscribed( $this->type ) == '1' ) {
 				return;
 			}
 			// render our field if the user isn't current subscribed
-			echo do_action( 'yikes-mailchimp-before-checkbox' , $this->type );
+			echo do_action( 'yikes-mailchimp-before-checkbox', $this->type );
 				echo $this->yikes_get_checkbox();
-			echo do_action( 'yikes-mailchimp-after-checkbox' , $this->type );
+			echo do_action( 'yikes-mailchimp-after-checkbox', $this->type );
 		}	
 		
 		
@@ -47,7 +47,7 @@ 
 		 */
 		public function update_payment_post_meta( $payment_id = 0, $payment_data = array() ) {
 			// don't save anything if the checkbox was not checked
-			if( ! $this->was_checkbox_checked( $this->type ) ) {
+			if ( ! $this->was_checkbox_checked( $this->type ) ) {
 				update_post_meta( $payment_id, '_yikes_easy_mc_optin', '0' );
 				return;
 			}
@@ -60,25 +60,25 @@ 
 		 * @return bool|string
 		 */
 		public function subscribe_from_edd_purchase( $payment_id ) {
-			$meta = get_post_meta( $payment_id , '_yikes_easy_mc_optin' , true );
-			if( $meta == '0' ) {
+			$meta = get_post_meta( $payment_id, '_yikes_easy_mc_optin', true );
+			if ( $meta == '0' ) {
 				return false;
 			}
 			$email = (string) edd_get_payment_user_email( $payment_id );
 			$merge_vars = array();
 			// add first and last name to merge vars, if given
 			$user_info = (array) edd_get_payment_meta_user_info( $payment_id );
-			if( isset( $user_info['first_name'] ) && isset( $user_info['last_name'] ) ) {
-				$merge_vars['NAME'] = $user_info['first_name'] . ' ' . $user_info['last_name'];
+			if ( isset( $user_info[ 'first_name' ] ) && isset( $user_info[ 'last_name' ] ) ) {
+				$merge_vars[ 'NAME' ] = $user_info[ 'first_name' ] . ' ' . $user_info[ 'last_name' ];
 			}
-			if( isset( $user_info['first_name'] ) ) {
-				$merge_vars['FNAME'] = $user_info['first_name'];
+			if ( isset( $user_info[ 'first_name' ] ) ) {
+				$merge_vars[ 'FNAME' ] = $user_info[ 'first_name' ];
 			}
-			if( isset( $user_info['last_name'] ) ) {
-				$merge_vars['LNAME'] = $user_info['last_name'];
+			if ( isset( $user_info[ 'last_name' ] ) ) {
+				$merge_vars[ 'LNAME' ] = $user_info[ 'last_name' ];
 			}
 			// subscribe the user
-			$this->subscribe_user_integration( sanitize_email( $email ) , $this->type , $merge_vars );
+			$this->subscribe_user_integration( sanitize_email( $email ), $this->type, $merge_vars );
 		}
 	
 	}

public/classes/checkbox-integrations/class.comment_form-checkbox.php

Spacing +6 added lines, -6 removed lines

@@ -6,7 +6,7 @@ 
 	*/
 	
 	// Prevent direct access to the file
-	defined('ABSPATH') or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!" , 'yikes-inc-easy-mailchimp-extender' ) );
+	defined( 'ABSPATH' ) or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!", 'yikes-inc-easy-mailchimp-extender' ) );
 	
 	class Yikes_Easy_MC_Comment_Checkbox_Class extends Yikes_Easy_MC_Checkbox_Integration_Class {
 	
@@ -27,12 +27,12 @@ 
 		* Outputs a checkbox, if user is not already subscribed
 		*/
 		public function output_checkbox( $comment_field ) {
-			if( $this->is_user_already_subscribed( $this->type ) == '1' ) {
+			if ( $this->is_user_already_subscribed( $this->type ) == '1' ) {
 				return $comment_field;
 			}
-				echo do_action( 'yikes-mailchimp-before-checkbox' , $this->type );
+				echo do_action( 'yikes-mailchimp-before-checkbox', $this->type );
 					echo $comment_field . $this->yikes_get_checkbox();
-				echo do_action( 'yikes-mailchimp-after-checkbox' , $this->type );
+				echo do_action( 'yikes-mailchimp-after-checkbox', $this->type );
 		}		
 	
 		/**
@@ -41,7 +41,7 @@ 
 		 *
 		 *	@since 6.0.0
 		**/
-		public function subscribe_from_comment( $comment_id , $comment_approved ) {	
+		public function subscribe_from_comment( $comment_id, $comment_approved ) {	
 			// was sign-up checkbox checked?
 			if ( $this->was_checkbox_checked( $this->type ) === false ) {
 				return false;
@@ -58,7 +58,7 @@ 
 				'OPTIN_IP' => $comment_data->comment_author_IP,
 			);
 			// subscribe the user 
-			$this->subscribe_user_integration( sanitize_email( $comment_data->comment_author_email ) , $this->type , $merge_vars );
+			$this->subscribe_user_integration( sanitize_email( $comment_data->comment_author_email ), $this->type, $merge_vars );
 		}
 		
 	}

public/classes/checkbox-integrations/class.buddypress_form-checkbox.php

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
 	*/
 	
 	// Prevent direct access to the file
-	defined('ABSPATH') or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!" , 'yikes-inc-easy-mailchimp-extender' ) );
+	defined( 'ABSPATH' ) or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!", 'yikes-inc-easy-mailchimp-extender' ) );
 	
 	class Yikes_Easy_MC_BuddyPress_Checkbox_Class extends Yikes_Easy_MC_Checkbox_Integration_Class {
 		
@@ -21,7 +21,7 @@ 
 		* Outputs a checkbox, if user is not already subscribed
 		*/
 		public function output_checkbox() {
-			if( $this->is_user_already_subscribed( $this->type ) == '1' ) {
+			if ( $this->is_user_already_subscribed( $this->type ) == '1' ) {
 				return;
 			}
 			?>

public/classes/checkbox-integrations/class.woocommerce_checkout_form-checkbox.php

Spacing +11 added lines, -11 removed lines

@@ -8,7 +8,7 @@ 
 */
 
 // Prevent direct access to the file
-defined('ABSPATH') or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!" , 'yikes-inc-easy-mailchimp-extender' ) );
+defined( 'ABSPATH' ) or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!", 'yikes-inc-easy-mailchimp-extender' ) );
 
 class Yikes_Easy_MC_WooCommerce_Checkbox_Class extends Yikes_Easy_MC_Checkbox_Integration_Class {
 
@@ -32,7 +32,7 @@ 
 	 */
 	public function get_position() {
 		$opts = $this->get_options();
-		return $opts['woocommerce_position'];
+		return $opts[ 'woocommerce_position' ];
 	}
 	
 	/**
@@ -42,22 +42,22 @@ 
 	 */
 	public function add_checkout_field( $fields ) {
 		// get checkbox data
-		$checkbox_options = get_option( 'optin-checkbox-init' , '' );
+		$checkbox_options = get_option( 'optin-checkbox-init', '' );
 		// only display the field if a list is set
-		if( isset( $checkbox_options ) && $checkbox_options[$this->type]['associated-list'] != '-' ) {
-			if( $this->is_user_already_subscribed( $this->type ) == '1' ) {
+		if ( isset( $checkbox_options ) && $checkbox_options[ $this->type ][ 'associated-list' ] != '-' ) {
+			if ( $this->is_user_already_subscribed( $this->type ) == '1' ) {
 				return $fields;
 			}
-			if( isset( $checkbox_options[$this->type]['precheck'] ) && $checkbox_options[$this->type]['precheck'] == 'true' ) {
+			if ( isset( $checkbox_options[ $this->type ][ 'precheck' ] ) && $checkbox_options[ $this->type ][ 'precheck' ] == 'true' ) {
 				$precheck = '1';
 			} else {
 				$precheck = '0';
 			}
-			$fields[ 'billing' ]['yikes_mailchimp_checkbox_'.$this->type] = array(
-				'id' => 'yikes_mailchimp_checkbox_'.$this->type,
+			$fields[ 'billing' ][ 'yikes_mailchimp_checkbox_' . $this->type ] = array(
+				'id' => 'yikes_mailchimp_checkbox_' . $this->type,
 				'type'    => 'checkbox',
 				'class' => array(),
-				'label'   => $checkbox_options[$this->type]['label'],
+				'label'   => $checkbox_options[ $this->type ][ 'label' ],
 				'default' => $precheck,
 			);
 		}
@@ -78,7 +78,7 @@ 
 	*/
 	public function subscribe_from_woocommerce_checkout( $order_id ) {
 		$do_optin = get_post_meta( $order_id, 'yikes_easy_mailchimp_optin', true );
-		if( $do_optin == '1' ) {
+		if ( $do_optin == '1' ) {
 			$order = new WC_Order( $order_id );
 			$email = $order->billing_email;
 			$merge_vars = array(
@@ -87,7 +87,7 @@ 
 				'LNAME' => $order->billing_last_name,
 			);
 			// subscribe the user
-			$this->subscribe_user_integration( sanitize_email( $email ) , $this->type , $merge_vars );
+			$this->subscribe_user_integration( sanitize_email( $email ), $this->type, $merge_vars );
 		}
 		return false;
 	}

public/classes/checkbox-integrations/class.registration_form-checkbox.php

Spacing +6 added lines, -6 removed lines

@@ -8,7 +8,7 @@ 
 */
 
 // Prevent direct access to the file
-defined('ABSPATH') or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!" , 'yikes-inc-easy-mailchimp-extender' ) );
+defined( 'ABSPATH' ) or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!", 'yikes-inc-easy-mailchimp-extender' ) );
 	
 class Yikes_Easy_MC_Registration_Checkbox_Class extends Yikes_Easy_MC_Checkbox_Integration_Class {
 
@@ -20,7 +20,7 @@ 
 		add_action( 'register_form', array( $this, 'output_checkbox' ), 20 );
 		add_action( 'user_register', array( $this, 'subscribe_from_registration' ), 90, 1 );
 		// alter the error message, if there was an error with the users email address
-		add_filter( 'wp_login_errors', array( $this , 'yikes_reg_complete_msg' ), 10,  2 );
+		add_filter( 'wp_login_errors', array( $this, 'yikes_reg_complete_msg' ), 10, 2 );
 	}
 	
 	/**
@@ -51,12 +51,12 @@ 
 		// build our merge vars
 		$merge_variables = $this->user_merge_vars( $user );
 		// only subscribe the user if they aren't already on the list
-		if( $this->is_new_registration_already_subscribed( $user->user_email , 'registration_form' ) != '1' ) {
-			$this->subscribe_user_integration( sanitize_email( $user->user_email ) , $this->type , $merge_variables );
+		if ( $this->is_new_registration_already_subscribed( $user->user_email, 'registration_form' ) != '1' ) {
+			$this->subscribe_user_integration( sanitize_email( $user->user_email ), $this->type, $merge_variables );
 		} else {
 			// add a temporary option to pass our email address and let the user know they are already subscribed
-			$user_already_subscirbed_message = sprintf( __( "You have not been subscribed to our mailing list. %s is already subscribed to this list.", "yikes-inc-easy-mailchimp-extender" ), $user->user_email  );
-			add_option( 'yikes_register_subscription_error' , $user_already_subscirbed_message );
+			$user_already_subscirbed_message = sprintf( __( "You have not been subscribed to our mailing list. %s is already subscribed to this list.", "yikes-inc-easy-mailchimp-extender" ), $user->user_email );
+			add_option( 'yikes_register_subscription_error', $user_already_subscirbed_message );
 		}
 	}
 	

public/classes/checkbox-integrations/class.contact_form_7-checkbox.php

Spacing +6 added lines, -6 removed lines

@@ -11,7 +11,7 @@ 
 */
 	
 // Prevent direct access to the file
-defined('ABSPATH') or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!" , 'yikes-inc-easy-mailchimp-extender' ) );
+defined( 'ABSPATH' ) or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!", 'yikes-inc-easy-mailchimp-extender' ) );
 
 class Yikes_Easy_MC_CF7_Checkbox_Class extends Yikes_Easy_MC_Checkbox_Integration_Class {
 	/**
@@ -26,7 +26,7 @@ 
 		// initialize
 		$this->init();
 		add_action( 'wpcf7_mail_sent', array( $this, 'new_cf7_subscription' ) );
-		add_action( 'wpcf7_posted_data', array( $this, 'alter_cf7_data') );
+		add_action( 'wpcf7_posted_data', array( $this, 'alter_cf7_data' ) );
 	}
 	
 	/**
@@ -35,7 +35,7 @@ 
 	* @return boolean
 	*/
 	public function init() {
-		if( ! function_exists( 'wpcf7_add_shortcode' ) ) {
+		if ( ! function_exists( 'wpcf7_add_shortcode' ) ) {
 			return false;
 		}
 		wpcf7_add_shortcode( 'yikes_mailchimp_checkbox', array( $this, 'yikes_get_checkbox' ) );
@@ -51,7 +51,7 @@ 
 	* @return array
 	*/
 	public function alter_cf7_data( $data = array() ) {
-		$data['yikes_mailchimp_checkbox'] = $this->was_checkbox_checked( $this->type ) ? __( 'Yes', 'yikes-inc-easy-mailchimp-extender' ) : __( 'No', 'yikes-inc-easy-mailchimp-extender' );
+		$data[ 'yikes_mailchimp_checkbox' ] = $this->was_checkbox_checked( $this->type ) ? __( 'Yes', 'yikes-inc-easy-mailchimp-extender' ) : __( 'No', 'yikes-inc-easy-mailchimp-extender' );
 		return $data;
 	}
 	
@@ -64,7 +64,7 @@ 
 			return false;
 		}
 		// get the integration options
-		$integration_options = get_option( 'optin-checkbox-init' , '' );
+		$integration_options = get_option( 'optin-checkbox-init', '' );
 		// get the contact form 7 submission instance
 		$submission = WPCF7_Submission::get_instance();
 		// confirm the submission was received
@@ -72,7 +72,7 @@ 
 			// get the submission data
 			$posted_data = $submission->get_posted_data();
 			// store the email -- this needs to be more dynamic (find string with containing string email?)
-			$email = ( isset( $posted_data['your-email'] ) ) ? $posted_data['your-email'] : '';
+			$email = ( isset( $posted_data[ 'your-email' ] ) ) ? $posted_data[ 'your-email' ] : '';
 			// submit this subscriber
 			return $this->subscribe_user_integration( $email, $this->type, apply_filters( 'yikes-mailchimp-contact-form-7', array(), $posted_data ) );
 		}

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

Spacing +31 added lines, -31 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
@@ -96,15 +96,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';
 				}
 			}
 		}
@@ -118,7 +118,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;
@@ -131,18 +131,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;
 						}
@@ -158,27 +158,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;
 		}

public/helpers.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 *	
 *	@since 6.0.0
 */
-function yksemeProcessSnippet( $list=false, $submit_text ) {
+function yksemeProcessSnippet( $list = false, $submit_text ) {
 	$submit_text = ( isset( $submit_text ) ) ? 'submit="' . $submit_text . '"' : '';
 	return do_shortcode( '[yikes-mailchimp form="' . $list . '" ' . $submit_text . ']' );
 }
@@ -21,7 +21,7 @@ 
 *	@since 6.0.3.4
 */
 function yikes_get_form_data( $form_id ) {
-	if( ! $form_id ) {
+	if ( ! $form_id ) {
 		return __( 'Whoops, you forgot to specify a form ID.', 'yikes-inc-easy-mailchimp-extender' );
 	}
 	return Yikes_Inc_Easy_Mailchimp_Extender_Public::yikes_retrieve_form_settings( $form_id );

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

Spacing +4 added lines, -4 removed lines

@@ -8,7 +8,7 @@ 
 		if ( function_exists( 'is_multisite' ) && is_multisite() ) {
 			// users can only unisntall a plugin from the network dashboard page
 			// 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::_uninstall_yikes_easy_mailchimp( $wpdb );
@@ -28,13 +28,13 @@ 
 	 * @since    6.0.0
 	 */
 	static function _uninstall_yikes_easy_mailchimp( $wpdb ) {
-		require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 		/* Clean up and delete our custom table from the databse */
-		$table = $wpdb->prefix."yikes_easy_mc_forms";
+		$table = $wpdb->prefix . "yikes_easy_mc_forms";
 		$sql = 'DROP TABLE IF EXISTS ' . $table;
 		//Delete any options thats stored also?
 		$wpdb->query( $sql );
-		dbDelta($sql);
+		dbDelta( $sql );
 		/* Clear All Transient Data */
 		// Delete list data transient data
 		delete_transient( 'yikes-easy-mailchimp-list-data' );