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;

public/classes/checkbox-integrations.php

Spacing +58 added lines, -58 removed lines

@@ -5,7 +5,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_Checkbox_Integration_Class {
 	
@@ -25,35 +25,35 @@ 
 		*/
 		public function is_user_already_subscribed( $integration_type ) {
 			// first check if the user is logged in
-			if( is_user_logged_in() ) {
-				$checkbox_options = get_option( 'optin-checkbox-init' , '' );
+			if ( is_user_logged_in() ) {
+				$checkbox_options = get_option( 'optin-checkbox-init', '' );
 				$current_user = wp_get_current_user();
 				$email = $current_user->user_email;
 
-				$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
+				$api_key = trim( get_option( 'yikes-mc-api-key', '' ) );
 				$dash_position = strpos( $api_key, '-' );
-				if( $dash_position !== false ) {
+				if ( $dash_position !== false ) {
 					$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/member-info.json';
 				}
 				$already_subscribed = wp_remote_post( $api_endpoint, array( 
 					'body' => array( 
 						'apikey' => $api_key, 
-						'id' => $checkbox_options[$integration_type]['associated-list'],
+						'id' => $checkbox_options[ $integration_type ][ 'associated-list' ],
 						'emails' => array( array( 'email' => sanitize_email( $email ) ) )
 					),
 					'timeout' => 10,
 					'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 				) );
 				$already_subscribed = json_decode( wp_remote_retrieve_body( $already_subscribed ), true );	
-				if( isset( $already_subscribed['error'] ) ) {	
-					if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+				if ( isset( $already_subscribed[ '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( $already_subscribed['error'], __( "Get Member Info" , 'yikes-inc-easy-mailchimp-extender' ), "Checkbox Integrations Page" );
+						$error_logging->yikes_easy_mailchimp_write_to_error_log( $already_subscribed[ 'error' ], __( "Get Member Info", 'yikes-inc-easy-mailchimp-extender' ), "Checkbox Integrations Page" );
 					}
 				}
-				if( ! Isset( $already_subscribed['error'] ) ) {
-					return $already_subscribed['success_count'];
+				if ( ! Isset( $already_subscribed[ 'error' ] ) ) {
+					return $already_subscribed[ 'success_count' ];
 				}
 			} else {
 				// if the user isn't logged in
@@ -69,33 +69,33 @@ 
 		*	@$email - users email address entered into the form
 		*	@$integration_type - pass in the type of checkbox integration
 		*/
-		public function is_new_registration_already_subscribed( $email , $integration_type ) {
+		public function is_new_registration_already_subscribed( $email, $integration_type ) {
 			// first check if the user is logged in
-			$checkbox_options = get_option( 'optin-checkbox-init' , '' );
+			$checkbox_options = get_option( 'optin-checkbox-init', '' );
 			try {
-				$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
+				$api_key = trim( get_option( 'yikes-mc-api-key', '' ) );
 				$dash_position = strpos( $api_key, '-' );
-				if( $dash_position !== false ) {
+				if ( $dash_position !== false ) {
 					$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/member-info.json';
 				}
 				$already_subscribed = wp_remote_post( $api_endpoint, array( 
 					'body' => array( 
 						'apikey' => $api_key, 
-						'id' => $checkbox_options[$integration_type]['associated-list'],
+						'id' => $checkbox_options[ $integration_type ][ 'associated-list' ],
 						'emails' => array( array( 'email' => sanitize_email( $email ) ) )
 					),
 					'timeout' => 10,
 					'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 				) );
 				$already_subscribed = json_decode( wp_remote_retrieve_body( $already_subscribed ), true );
-				if( isset( $already_subscribed['error'] ) ) {	
-					if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+				if ( isset( $already_subscribed[ '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( $already_subscribed['error'], __( "Get Member Info" , 'yikes-inc-easy-mailchimp-extender' ), "Checkbox Integrations Page" );
+						$error_logging->yikes_easy_mailchimp_write_to_error_log( $already_subscribed[ 'error' ], __( "Get Member Info", 'yikes-inc-easy-mailchimp-extender' ), "Checkbox Integrations Page" );
 					}
 				}				
-				return $already_subscribed['success_count'];
+				return $already_subscribed[ 'success_count' ];
 			} catch ( Exception $error ) {
 				return $error->getMessage();
 			}
@@ -110,17 +110,17 @@ 
 			// enqueue our checkbox styles whenever the checkbox is displayed
 			wp_enqueue_style( 'yikes-easy-mailchimp-checkbox-integration-styles', plugin_dir_url( __FILE__ ) . '../css/yikes-inc-easy-mailchimp-checkbox-integration.min.css' );
 			// store our options
-			$checkbox_options = get_option( 'optin-checkbox-init' , '' );
-			if( isset( $checkbox_options[$this->type]['associated-list'] ) && $checkbox_options[$this->type]['associated-list'] != '-' ) {
-				$checked = ( $checkbox_options[$this->type]['precheck'] == 'true' ) ? 'checked' : '';
+			$checkbox_options = get_option( 'optin-checkbox-init', '' );
+			if ( isset( $checkbox_options[ $this->type ][ 'associated-list' ] ) && $checkbox_options[ $this->type ][ 'associated-list' ] != '-' ) {
+				$checked = ( $checkbox_options[ $this->type ][ 'precheck' ] == 'true' ) ? 'checked' : '';
 				// before checkbox HTML (comment, ...)
 				$before = '<!-- Easy Forms for MailChimp by YIKES, Inc. - https://www.yikesinc.com/ -->';
 				$before .= apply_filters( 'yikes-mailchimp-before-checkbox-html', '' );
 				// checkbox
 				$content = '<p id="yikes-easy-mailchimp-' . $this->type . '-checkbox" class="yikes-easy-mailchimp-' . $this->type . '-checkbox">';
 					$content .= '<label>';
-						$content .= '<input type="checkbox" name="yikes_mailchimp_checkbox_' . $this->type . '" value="1" '. $checked . ' /> ';
-						$content .= ( isset( $checkbox_options[$this->type]['label'] ) && trim( $checkbox_options[$this->type]['label'] ) != '' ) ? trim( $checkbox_options[$this->type]['label'] ) : __( 'Sign me up for your mailing list.', 'yikes-inc-easy-mailchimp-extender' );
+						$content .= '<input type="checkbox" name="yikes_mailchimp_checkbox_' . $this->type . '" value="1" ' . $checked . ' /> ';
+						$content .= ( isset( $checkbox_options[ $this->type ][ 'label' ] ) && trim( $checkbox_options[ $this->type ][ 'label' ] ) != '' ) ? trim( $checkbox_options[ $this->type ][ 'label' ] ) : __( 'Sign me up for your mailing list.', 'yikes-inc-easy-mailchimp-extender' );
 					$content .= '</label>';
 				$content .= '</p>';
 				// after checkbox HTML (..., honeypot, closing comment)
@@ -138,43 +138,43 @@ 
 		**/
 		public function subscribe_user_integration( $email, $type, $merge_vars ) {			
 			// get checkbox data
-			$checkbox_options = get_option( 'optin-checkbox-init' , '' );
-			if( $type != 'registration_form' ) {
+			$checkbox_options = get_option( 'optin-checkbox-init', '' );
+			if ( $type != 'registration_form' ) {
 				$update = '1';
 			} else {
 				$update = '0';
 			}
 			// set ip address
-			if( ! isset( $merge_vars['OPTIN_IP'] ) && isset( $_SERVER['REMOTE_ADDR'] ) ) {
-				$merge_vars['OPTIN_IP'] = sanitize_text_field( $_SERVER['REMOTE_ADDR'] );
+			if ( ! isset( $merge_vars[ 'OPTIN_IP' ] ) && isset( $_SERVER[ 'REMOTE_ADDR' ] ) ) {
+				$merge_vars[ 'OPTIN_IP' ] = sanitize_text_field( $_SERVER[ 'REMOTE_ADDR' ] );
 			}
 			// set the optin time
-			$merge_vars['OPTIN_TIME'] = current_time( 'Y-m-d H:i:s', 1 );
+			$merge_vars[ 'OPTIN_TIME' ] = current_time( 'Y-m-d H:i:s', 1 );
 			// check for interest groups
-			$interest_groups = ( isset( $checkbox_options[$type]['interest-groups'] ) ) ? $checkbox_options[$type]['interest-groups'] : false;
+			$interest_groups = ( isset( $checkbox_options[ $type ][ 'interest-groups' ] ) ) ? $checkbox_options[ $type ][ 'interest-groups' ] : false;
 			// if interest groups were found, push them to the merge variable array
-			if( $interest_groups ) {
-				$merge_vars['groupings'] = array();
-				foreach( $interest_groups as $interest_group_id => $interest_group_selections ) {
+			if ( $interest_groups ) {
+				$merge_vars[ 'groupings' ] = array();
+				foreach ( $interest_groups as $interest_group_id => $interest_group_selections ) {
 					// merge variable interest groups array
-					$merge_vars['groupings'][] = array(
+					$merge_vars[ 'groupings' ][ ] = array(
 						'id' => $interest_group_id,
 						'groups' => $interest_group_selections,
 					); 	
 				}
 				// replace the interest groups - to avoid any errors thrown if the admin switches lists, or interest groups
-				$merge_vars['replace_interests'] = 1;
+				$merge_vars[ 'replace_interests' ] = 1;
 			}
 			// initialize MailChimp API
-			$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
+			$api_key = trim( get_option( 'yikes-mc-api-key', '' ) );
 			$dash_position = strpos( $api_key, '-' );
-			if( $dash_position !== false ) {
+			if ( $dash_position !== false ) {
 				$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/subscribe.json';
 			}
 			$subscribe_response = wp_remote_post( $api_endpoint, array( 
 				'body' => apply_filters( 'yikes-mailchimp-checkbox-integration-subscribe-api-request', array( 
-					'apikey' => get_option( 'yikes-mc-api-key' , '' ),
-					'id' => $checkbox_options[$type]['associated-list'],
+					'apikey' => get_option( 'yikes-mc-api-key', '' ),
+					'id' => $checkbox_options[ $type ][ 'associated-list' ],
 					'email' => array( 'email' => sanitize_email( $email ) ),
 					'merge_vars' => apply_filters( 'yikes-mailchimp-checkbox-integration-merge-variables', $merge_vars, $type ), // filter merge variables
 					'double_optin' => 1,
@@ -184,13 +184,13 @@ 
 				'timeout' => 10,
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
-			if( ! Is_wp_error( $subscribe_response ) ) {
+			if ( ! Is_wp_error( $subscribe_response ) ) {
 				$response_body = json_decode( wp_remote_retrieve_body( $subscribe_response ), true );
-				if( WP_DEBUG || isset( $response_body['error'] ) ) {	
-					if( get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+				if ( WP_DEBUG || isset( $response_body[ 'error' ] ) ) {	
+					if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 						require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 						$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-						$error_logging->yikes_easy_mailchimp_write_to_error_log( $response_body['error'], __( "Checkbox Integration Subscribe User" , 'yikes-inc-easy-mailchimp-extender' ), "Checkbox Integrations" );
+						$error_logging->yikes_easy_mailchimp_write_to_error_log( $response_body[ 'error' ], __( "Checkbox Integration Subscribe User", 'yikes-inc-easy-mailchimp-extender' ), "Checkbox Integrations" );
 					}
 				}		
 			}
@@ -206,15 +206,15 @@ 
 			$merge_vars = array(
 				'NAME' => $user->user_login,
 			);
-			if( '' !== $user->first_name ) {
-				$merge_vars['NAME'] = $user->first_name;
-				$merge_vars['FNAME'] = $user->first_name;
+			if ( '' !== $user->first_name ) {
+				$merge_vars[ 'NAME' ] = $user->first_name;
+				$merge_vars[ 'FNAME' ] = $user->first_name;
 			}
-			if( '' !== $user->last_name ) {
-				$merge_vars['LNAME'] = $user->last_name;
+			if ( '' !== $user->last_name ) {
+				$merge_vars[ 'LNAME' ] = $user->last_name;
 			}
-			if( '' !== $user->first_name && '' !== $user->last_name ) {
-				$merge_vars['NAME'] = sprintf( '%s %s', $user->first_name, $user->last_name );
+			if ( '' !== $user->first_name && '' !== $user->last_name ) {
+				$merge_vars[ 'NAME' ] = sprintf( '%s %s', $user->first_name, $user->last_name );
 			}
 			/**
 			 * @filter `yikes-mailchimp-user-merge-vars`
@@ -235,7 +235,7 @@ 
 		*/
 		public function was_checkbox_checked( $type ) {
 			// was sign-up checkbox checked - return the value
-			return ( isset( $_POST[ 'yikes_mailchimp_checkbox_'.$type ] ) && $_POST[ 'yikes_mailchimp_checkbox_'.$type ] == 1 );
+			return ( isset( $_POST[ 'yikes_mailchimp_checkbox_' . $type ] ) && $_POST[ 'yikes_mailchimp_checkbox_' . $type ] == 1 );
 		}
 		
 		
@@ -245,15 +245,15 @@ 
 		* 	@since 6.0.0
 		**/
 		public function yikes_reg_complete_msg( $errors, $redirect_to ) {
-			if( isset( $errors->errors['registered'] ) ) {
-				$email_error = get_option( 'yikes_register_subscription_error' , '' );
-				if( isset( $email_error ) && $email_error != '' ) {	
+			if ( isset( $errors->errors[ 'registered' ] ) ) {
+				$email_error = get_option( 'yikes_register_subscription_error', '' );
+				if ( isset( $email_error ) && $email_error != '' ) {	
 					// Use the magic __get method to retrieve the errors array:
 					$tmp = $errors->errors; 
 					$old = 'Registration complete. Please check your e-mail.';
-					foreach( $tmp['registered'] as $index => $msg ) {
-						if( $msg === $old ) {
-							$tmp['registered'][$index] = $old . ' <p class="message"><strong>' . __( 'Note' , 'yikes-inc-easy-mailchimp-extender' ) . '</strong>: ' . $email_error . '</p>';        
+					foreach ( $tmp[ 'registered' ] as $index => $msg ) {
+						if ( $msg === $old ) {
+							$tmp[ 'registered' ][ $index ] = $old . ' <p class="message"><strong>' . __( 'Note', 'yikes-inc-easy-mailchimp-extender' ) . '</strong>: ' . $email_error . '</p>';        
 						}
 					}
 					// Use the magic __set method to override the errors property:

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

Spacing +3 added lines, -3 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_bbPress_Checkbox_Class extends Yikes_Easy_MC_Checkbox_Integration_Class {
 	
@@ -31,7 +31,7 @@ 
 		*/
 		public function output_checkbox() {
 			// if the user is already subscribed, abort and don't render the checkbox
-			if( $this->is_user_already_subscribed( $this->type ) == '1' ) {
+			if ( $this->is_user_already_subscribed( $this->type ) == '1' ) {
 				return;
 			}
 			echo $this->yikes_get_checkbox();
@@ -45,7 +45,7 @@ 
 		 */
 		public function subscribe_from_bbpress( $anonymous_data, $user_id, $trigger ) {
 			$user_data = get_userdata( $user_id );
-			return $this->subscribe_user_integration( $user_data->user_email, $this->type , array(
+			return $this->subscribe_user_integration( $user_data->user_email, $this->type, array(
 				'FNAME' => $user_data->first_name,
 				'LNAME' => $user_data->last_name,
 				'NAE' => $user_data->first_name,

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