yikesinc / yikes-inc-easy-mailchimp-extender

public/partials/ajax/class.public_ajax.php

Spacing +42 added lines, -42 removed lines

@@ -11,16 +11,16 @@ 
 		 */
 		public function __construct() {
 			// ajax process form submission
-			add_action( 'wp_ajax_nopriv_process_form_submission', array( $this , 'process_form_submission' ), 10 );
-			add_action( 'wp_ajax_process_form_submission', array( $this , 'process_form_submission' ), 10 );
+			add_action( 'wp_ajax_nopriv_process_form_submission', array( $this, 'process_form_submission' ), 10 );
+			add_action( 'wp_ajax_process_form_submission', array( $this, 'process_form_submission' ), 10 );
 
 			// ajax send update emails
-			add_action( 'wp_ajax_nopriv_easy_forms_send_email', array( $this , 'sendUpdateProfileEmail' ), 10 );
-			add_action( 'wp_ajax_easy_forms_send_email', array( $this , 'sendUpdateProfileEmail' ), 10 );
+			add_action( 'wp_ajax_nopriv_easy_forms_send_email', array( $this, 'sendUpdateProfileEmail' ), 10 );
+			add_action( 'wp_ajax_easy_forms_send_email', array( $this, 'sendUpdateProfileEmail' ), 10 );
 
 			// increase submission count for a given form on successful submit
-			add_action( 'wp_ajax_nopriv_increase_submission_count' , array( $this , 'increase_submission_count' ), 10 );
-			add_action( 'wp_ajax_increase_submission_count' , array( $this , 'increase_submission_count' ), 10 );
+			add_action( 'wp_ajax_nopriv_increase_submission_count', array( $this, 'increase_submission_count' ), 10 );
+			add_action( 'wp_ajax_increase_submission_count', array( $this, 'increase_submission_count' ), 10 );
 		}
 
 		/*
@@ -40,18 +40,18 @@ 
 		*/
 		public function increase_submission_count() {
 			// store our posted form ID
-			$form_id = $_POST['form_id'];
+			$form_id = $_POST[ 'form_id' ];
 			global $wpdb;
 			// query the form
 			$form_results = $wpdb->get_results( 'SELECT * FROM ' . $wpdb->prefix . 'yikes_easy_mc_forms WHERE id = ' . $form_id . '', ARRAY_A );
-			$form_data = $form_results[0];
+			$form_data = $form_results[ 0 ];
 			// increase the submission
-			$form_data['submissions']++;
+			$form_data[ 'submissions' ]++;
 			// update the value in the database
 			$wpdb->update(
 				$wpdb->prefix . 'yikes_easy_mc_forms',
 					array(
-						'submissions' => $form_data['submissions'],
+						'submissions' => $form_data[ 'submissions' ],
 					),
 					array( 'ID' => $form_id ),
 					array(
@@ -68,17 +68,17 @@ 
 			@since v6.0.4.1
 		*/
 		public function sendUpdateProfileEmail() {
-			$user_email = $_POST['user_email'];
-			$list_id = $_POST['list_id'];
+			$user_email = $_POST[ 'user_email' ];
+			$list_id = $_POST[ 'list_id' ];
 
-			$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
+			$api_key = trim( get_option( 'yikes-mc-api-key', '' ) );
 			$dash_position = strpos( $api_key, '-' );
-			$explode_key = explode( '-' , $api_key );
-			$data_center = $explode_key[1];
-			$full_site_url = get_bloginfo('url');
+			$explode_key = explode( '-', $api_key );
+			$data_center = $explode_key[ 1 ];
+			$full_site_url = get_bloginfo( 'url' );
 
 			// list details api call
-			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_details = wp_remote_post( $api_endpoint, array(
@@ -92,16 +92,16 @@ 
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
 			$list_details = json_decode( wp_remote_retrieve_body( $list_details ), true );
-			if( isset( $list_details['error'] ) ) {
-				if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+			if ( isset( $list_details[ '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_details['error'], __( "Send Update Profile Email - Get Account Lists" , 'yikes-inc-easy-mailchimp-extender' ), "class.public_ajax.php" );
+					$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_details[ 'error' ], __( "Send Update Profile Email - Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ), "class.public_ajax.php" );
 				}
 			}
 
 			// account details api call
-			if( $dash_position !== false ) {
+			if ( $dash_position !== false ) {
 				$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/helper/account-details.json';
 			}
 			$account_details = wp_remote_post( $api_endpoint, array(
@@ -112,16 +112,16 @@ 
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
 			$account_details = json_decode( wp_remote_retrieve_body( $account_details ), true );
-			if( isset( $account_details['error'] ) ) {
-				if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+			if ( isset( $account_details[ '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( $account_details['error'], __( "Send Update Profile Email - Get Account Details" , 'yikes-inc-easy-mailchimp-extender' ), "class.public_ajax.php" );
+					$error_logging->yikes_easy_mailchimp_write_to_error_log( $account_details[ 'error' ], __( "Send Update Profile Email - Get Account Details", 'yikes-inc-easy-mailchimp-extender' ), "class.public_ajax.php" );
 				}
 			}
 
 			// subscriber details api call
-			if( $dash_position !== false ) {
+			if ( $dash_position !== false ) {
 				$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/member-info.json';
 			}
 			$subscriber_account_details = wp_remote_post( $api_endpoint, array(
@@ -136,27 +136,27 @@ 
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
 			$subscriber_account_details = json_decode( wp_remote_retrieve_body( $subscriber_account_details ), true );
-			if( isset( $subscriber_account_details['error'] ) ) {
-				if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+			if ( isset( $subscriber_account_details[ '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( $subscriber_account_details['error'], __( "Send Update Profile Email - Get Member Info." , 'yikes-inc-easy-mailchimp-extender' ), "class.public_ajax.php" );
+					$error_logging->yikes_easy_mailchimp_write_to_error_log( $subscriber_account_details[ 'error' ], __( "Send Update Profile Email - Get Member Info.", 'yikes-inc-easy-mailchimp-extender' ), "class.public_ajax.php" );
 				}
 			}
 
 			// check for errors in any of the calls
-			if( isset( $list_details['error'] ) || isset( $account_details['error'] ) || isset( $subscriber_account_details['error'] ) ) {
-				$error_message = ( isset( $list_details['error'] ) ) ? $list_details['error'] : false;
-				if( ! $error_message ) {
-					$error_message = ( isset( $account_details['error'] ) ) ? $account_details['error'] : false;
-					if( ! $error_message ) {
-						$error_message = ( isset( $subscriber_account_details['error'] ) ) ? $subscriber_account_details['error'] : false;
-						if( ! $error_message ) {
+			if ( isset( $list_details[ 'error' ] ) || isset( $account_details[ 'error' ] ) || isset( $subscriber_account_details[ 'error' ] ) ) {
+				$error_message = ( isset( $list_details[ 'error' ] ) ) ? $list_details[ 'error' ] : false;
+				if ( ! $error_message ) {
+					$error_message = ( isset( $account_details[ 'error' ] ) ) ? $account_details[ 'error' ] : false;
+					if ( ! $error_message ) {
+						$error_message = ( isset( $subscriber_account_details[ 'error' ] ) ) ? $subscriber_account_details[ 'error' ] : false;
+						if ( ! $error_message ) {
 							$error_message = '';
 						}
 					}
 				}
-				$errorMessage = sprintf( __( 'Error sending update profile email. <strong>Error: %s</strong>. Please contact the site administrator.' , 'yikes-inc-easy-mailchimp-extender' ), $error_message );
+				$errorMessage = sprintf( __( 'Error sending update profile email. <strong>Error: %s</strong>. Please contact the site administrator.', 'yikes-inc-easy-mailchimp-extender' ), $error_message );
 				wp_send_json_error(
 					array(
 						'response_text' => '<div class="yikes-easy-mc-error-message">&#10005; ' . $errorMessage . '</div>',
@@ -166,11 +166,11 @@ 
 			}
 
 			// send the email!
-			$subscriber_id = $subscriber_account_details['data'][0]['id'];
-			$explode_url = explode( '.' , $account_details['contact']['url'] );
-			$update_link_href = 'http://' . $explode_url[1] . '.' . $data_center . '.list-manage1.com/profile?u=' . $account_details['user_id'] . '&id=' . $list_id .'&e=' . $subscriber_id;
+			$subscriber_id = $subscriber_account_details[ 'data' ][ 0 ][ 'id' ];
+			$explode_url = explode( '.', $account_details[ 'contact' ][ 'url' ] );
+			$update_link_href = 'http://' . $explode_url[ 1 ] . '.' . $data_center . '.list-manage1.com/profile?u=' . $account_details[ 'user_id' ] . '&id=' . $list_id . '&e=' . $subscriber_id;
 			$subject = 'MailChimp Profile Update';
-			$headers = 'From: ' . $list_details['data'][0]['default_from_name'] . ' <' . $list_details['data'][0]['default_from_email'] . '>' . "\r\n";
+			$headers = 'From: ' . $list_details[ 'data' ][ 0 ][ 'default_from_name' ] . ' <' . $list_details[ 'data' ][ 0 ][ 'default_from_email' ] . '>' . "\r\n";
 			$headers .= 'Content-type: text/html';
 				$email_content = '<p>Greetings,</p> <p>A request has been made to update your MailChimp account profile information. To do so please use the following link: <a href="' . $update_link_href . '" title="Update MailChimp Profile">Update MailChimp Profile Info.</a>';
 				$email_content .= "<p>If you did not request this update, please disregard this email.</p>";
@@ -183,14 +183,14 @@ 
 			if ( wp_mail( $user_email, apply_filters( 'yikes-mailchimp-update-email-subject', $subject ), apply_filters( 'yikes-mailchimp-update-email-content', $email_content, $update_link_href ), $headers ) ) {
 				wp_send_json_success(
 					array(
-						'response_text' => '<div class="yikes-easy-mc-success-message">' . sprintf( __( '%s Update email successfully sent. Please check your inbox for the message.' , 'yikes-inc-easy-mailchimp-extender' ), '&#10004;' ) . '</div>',
+						'response_text' => '<div class="yikes-easy-mc-success-message">' . sprintf( __( '%s Update email successfully sent. Please check your inbox for the message.', 'yikes-inc-easy-mailchimp-extender' ), '&#10004;' ) . '</div>',
 					)
 				);
 				exit;
 			} else {
 				wp_send_json_error(
 					array(
-						'response_text' => '<div class="yikes-easy-mc-error-message">' . sprintf( __( '%s Email failed to send. Please contact the site administrator.' , 'yikes-inc-easy-mailchimp-extender' ), '&#10005;' ) . '</div>',
+						'response_text' => '<div class="yikes-easy-mc-error-message">' . sprintf( __( '%s Email failed to send. Please contact the site administrator.', 'yikes-inc-easy-mailchimp-extender' ), '&#10005;' ) . '</div>',
 					)
 				);
 				exit;

Braces +1 added lines, -2 removed lines

@@ -1,6 +1,5 @@
 <?php
-	class YIKES_Inc_Easy_MailChimp_Public_Ajax
-	{
+	class YIKES_Inc_Easy_MailChimp_Public_Ajax {
 
 		/**
 		 * Thetext domain of this plugin

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

Indentation +3 added lines, -3 removed lines

@@ -24,8 +24,8 @@ 
 			
 		
 		/**
-		* Outputs a checkbox, if user is not already subscribed
-		*/
+		 * Outputs a checkbox, if user is not already subscribed
+		 */
 		public function output_checkbox( $comment_field ) {
 			if( $this->is_user_already_subscribed( $this->type ) == '1' ) {
 				return $comment_field;
@@ -40,7 +40,7 @@ 
 		 *	a new comment is submitted
 		 *
 		 *	@since 6.0.0
-		**/
+		 **/
 		public function subscribe_from_comment( $comment_id , $comment_approved ) {	
 			// was sign-up checkbox checked?
 			if ( $this->was_checkbox_checked( $this->type ) === false ) {

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 );
 		}
 		
 	}

Braces +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 		// declare our integration type
 		protected $type = 'comment_form';
 	
-		public function __construct() {	
+		public function __construct() {
 			// hooks for outputting the checkbox
 			add_action( 'thesis_hook_after_comment_box', array( $this, 'output_checkbox' ), 10 );
 			add_action( 'comment_form_field_comment', array( $this, 'output_checkbox' ), 10 );
@@ -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;

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

Indentation +5 added lines, -5 removed lines

@@ -65,17 +65,17 @@
 	}
 	
 	/**
-	* @param int $order_id
-	*/
+	 * @param int $order_id
+	 */
 	public function save_woocommerce_checkout_checkbox_value( $order_id ) {
 		// update the order post meta
 		update_post_meta( $order_id, 'yikes_easy_mailchimp_optin', $this->was_checkbox_checked( $this->type ) );
 	}
 	
 	/**
-	* @param int $order_id
-	* @return boolean
-	*/
+	 * @param int $order_id
+	 * @return boolean
+	 */
 	public function subscribe_from_woocommerce_checkout( $order_id ) {
 		$do_optin = get_post_meta( $order_id, 'yikes_easy_mailchimp_optin', true );
 		if( $do_optin == '1' ) {

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.contact_form_7-checkbox.php

Indentation +12 added lines, -12 removed lines

@@ -30,10 +30,10 @@ 
 	}
 	
 	/**
-	* Registers the CF7 shortcode
+	 * Registers the CF7 shortcode
 	 *
-	* @return boolean
-	*/
+	 * @return boolean
+	 */
 	public function init() {
 		if( ! function_exists( 'wpcf7_add_shortcode' ) ) {
 			return false;
@@ -43,21 +43,21 @@ 
 	}
 	
 	/**
-	* Alter Contact Form 7 data.
-	*
-	* Adds yikes_mailchimp_checkbox to post data so users can use `yikes_mailchimp_checkbox` in their email templates
-	*
-	* @param array $data
-	* @return array
-	*/
+	 * Alter Contact Form 7 data.
+	 *
+	 * Adds yikes_mailchimp_checkbox to post data so users can use `yikes_mailchimp_checkbox` in their email templates
+	 *
+	 * @param array $data
+	 * @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' );
 		return $data;
 	}
 	
 	/**
-	* Subscribe from Contact Form 7 Forms
-	*/
+	 * Subscribe from Contact Form 7 Forms
+	 */
 	public function new_cf7_subscription( $contact_form ) {
 		// was sign-up checkbox checked?
 		if ( $this->was_checkbox_checked( $this->type ) === false ) {

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

Indentation +5 added lines, -5 removed lines

@@ -73,10 +73,10 @@ 
 	}
 	
 	/**
-	*	Create our own custom the_content(); filter to prevent plugins and such from hooking in where not wanted
-	*
-	*	@since 6.0.3
-	*/
+	 *	Create our own custom the_content(); filter to prevent plugins and such from hooking in where not wanted
+	 *
+	 *	@since 6.0.3
+	 */
 	public function yikes_custom_frontend_content_filter() {
 		add_filter( 'yikes-mailchimp-frontend-content', 'wptexturize' );
 		add_filter( 'yikes-mailchimp-frontend-content', 'convert_smilies' );
@@ -93,7 +93,7 @@ 
 	 *	load our checkbox classes
 	 *
 	 *	@since 6.0.0
-	**/
+	 **/
 	public function load_checkbox_integration_classes() {
 		// store our options
 		$integrations = get_option( 'optin-checkbox-init' , '' );

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;
 		}

Braces +3 added lines, -2 removed lines

@@ -101,7 +101,7 @@ 
 			// 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 ) {	
+			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';
@@ -136,7 +136,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/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' );

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

includes/import-export/yikes-easy-mailchimp-import.class.php

Spacing +53 added lines, -53 removed lines

@@ -10,54 +10,54 @@ 
 	*/	
 	public static function yikes_mailchimp_import_forms( $csv_file ) {
 	
-		if( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-import-forms' ) {
-			$name = $csv_file['csv']['name'];
-			$ext_array = explode('.', $name);
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-import-forms' ) {
+			$name = $csv_file[ 'csv' ][ 'name' ];
+			$ext_array = explode( '.', $name );
 			$ext = end( $ext_array );
-			$tmpName = $csv_file['csv']['tmp_name'];
-			if($ext === 'csv') {
-				if(($handle = fopen($tmpName, 'r')) !== FALSE) {
-					$num = count($handle);
-					$file = fopen( $tmpName, 'r');
+			$tmpName = $csv_file[ 'csv' ][ 'tmp_name' ];
+			if ( $ext === 'csv' ) {
+				if ( ( $handle = fopen( $tmpName, 'r' ) ) !== FALSE ) {
+					$num = count( $handle );
+					$file = fopen( $tmpName, 'r' );
 					$row = 1;
-					while (($line = fgetcsv($file, 10000, ',')) !== FALSE) {
-						if( count( $line ) > 1 ) {
+					while ( ( $line = fgetcsv( $file, 10000, ',' ) ) !== FALSE ) {
+						if ( count( $line ) > 1 ) {
 							// Check if this is a settings import by confirming the first option is 'yikes-mc-api-key'
-							if( $line[0] == 'yikes-mc-api-key' ) {	
-								$options = fgetcsv($file, 10000, ',');
+							if ( $line[ 0 ] == 'yikes-mc-api-key' ) {	
+								$options = fgetcsv( $file, 10000, ',' );
 								$new_settings = array();
 								$x = 0;
 								// build our new array $key => $value pair
-								foreach( $line as $option_name ) {
-									$new_settings[$option_name] = $options[$x]; 
+								foreach ( $line as $option_name ) {
+									$new_settings[ $option_name ] = $options[ $x ]; 
 									$x++;
 								}
 								// update the options in the databse
-								foreach( $new_settings as $option_name => $option_value ) {
+								foreach ( $new_settings as $option_name => $option_value ) {
 									update_option( $option_name, $option_value );
 								}
 							} else { // if it's not, then it's an opt-in forms import
 								global $wpdb;		
-								if( $row != 1 ) {
+								if ( $row != 1 ) {
 									$wpdb->insert(
 										$wpdb->prefix . 'yikes_easy_mc_forms',
 										array(
-											'list_id' => $line[1],
-											'form_name' => stripslashes( $line[2] ),
-											'form_description' => stripslashes( $line[3] ),
-											'fields' => $line[4],
-											'custom_styles' => $line[5],
-											'custom_template' => $line[6],
-											'send_welcome_email' => $line[7],
-											'redirect_user_on_submit' => $line[8],
-											'redirect_page' => $line[9],
-											'submission_settings' => $line[10],
-											'optin_settings' => $line[11],
-											'error_messages' => $line[12],
-											'custom_notifications' => $line[13],
-											'impressions' => $line[14],
-											'submissions' => $line[15],
-											'custom_fields' => $line[16],
+											'list_id' => $line[ 1 ],
+											'form_name' => stripslashes( $line[ 2 ] ),
+											'form_description' => stripslashes( $line[ 3 ] ),
+											'fields' => $line[ 4 ],
+											'custom_styles' => $line[ 5 ],
+											'custom_template' => $line[ 6 ],
+											'send_welcome_email' => $line[ 7 ],
+											'redirect_user_on_submit' => $line[ 8 ],
+											'redirect_page' => $line[ 9 ],
+											'submission_settings' => $line[ 10 ],
+											'optin_settings' => $line[ 11 ],
+											'error_messages' => $line[ 12 ],
+											'custom_notifications' => $line[ 13 ],
+											'impressions' => $line[ 14 ],
+											'submissions' => $line[ 15 ],
+											'custom_fields' => $line[ 16 ],
 										),
 										array(
 											'%s', // list id
@@ -65,16 +65,16 @@ 
 											'%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
-											'%d',	// impressions #
-											'%d',	// submissions #
+											'%d', // impressions #
+											'%d', // submissions #
 											'%s', // custom fields
 										)
 									);
@@ -83,9 +83,9 @@ 
 						}	
 						$row++;
 					}
-					fclose($file);
+					fclose( $file );
 				} else {
-					wp_die( __( 'There was an error during import. If you continue to run into issues, please reach out to the Yikes Inc. support team.' , 'yikes-inc-easy-mailchimp-extender' ) );
+					wp_die( __( 'There was an error during import. If you continue to run into issues, please reach out to the Yikes Inc. support team.', 'yikes-inc-easy-mailchimp-extender' ) );
 				}
 			}
 			
@@ -101,20 +101,20 @@ 
 	*/	
 	public static function yikes_mailchimp_import_type( $csv_file ) {
 		// confirm
-		if( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-import-forms' ) {
-			$name = $csv_file['csv']['name'];
-			$ext_array = explode('.', $name);
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-import-forms' ) {
+			$name = $csv_file[ 'csv' ][ 'name' ];
+			$ext_array = explode( '.', $name );
 			$ext = end( $ext_array );
-			$tmpName = $csv_file['csv']['tmp_name'];
-			if($ext === 'csv') {
-				if(($handle = fopen($tmpName, 'r')) !== FALSE) {
-					$num = count($handle);
-					$file = fopen( $tmpName, 'r');
+			$tmpName = $csv_file[ 'csv' ][ 'tmp_name' ];
+			if ( $ext === 'csv' ) {
+				if ( ( $handle = fopen( $tmpName, 'r' ) ) !== FALSE ) {
+					$num = count( $handle );
+					$file = fopen( $tmpName, 'r' );
 					$row = 1;
-					$first_line_data = fgetcsv($file, 10000, ',');
-					if( count( $first_line_data ) > 1 ) {
+					$first_line_data = fgetcsv( $file, 10000, ',' );
+					if ( count( $first_line_data ) > 1 ) {
 						// Check if this is a settings import by confirming the first option is 'yikes-mc-api-key'
-						if( $first_line_data[0] == 'yikes-mc-api-key' ) {
+						if ( $first_line_data[ 0 ] == 'yikes-mc-api-key' ) {
 							$import_type = 'import-settings';
 						} else {
 							$import_type = 'import-forms';

Braces +3 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 					while (($line = fgetcsv($file, 10000, ',')) !== FALSE) {
 						if( count( $line ) > 1 ) {
 							// Check if this is a settings import by confirming the first option is 'yikes-mc-api-key'
-							if( $line[0] == 'yikes-mc-api-key' ) {	
+							if( $line[0] == 'yikes-mc-api-key' ) {
 								$options = fgetcsv($file, 10000, ',');
 								$new_settings = array();
 								$x = 0;
@@ -36,7 +36,8 @@ 
 								foreach( $new_settings as $option_name => $option_value ) {
 									update_option( $option_name, $option_value );
 								}
-							} else { // if it's not, then it's an opt-in forms import
+							} else {
+// if it's not, then it's an opt-in forms import
 								global $wpdb;		
 								if( $row != 1 ) {
 									$wpdb->insert(