yikesinc / yikes-inc-easy-mailchimp-extender

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

Braces +10 added lines, -10 removed lines

@@ -5,18 +5,18 @@ 
 *	@since 6.0.3

 */

 

-class YIKES_Mailchimp_Visual_Composer_Extension {

+class YIKES_Mailchimp_Visual_Composer_Extension {
 

 	/**

 	 * Constructor

 	 *

 	 * @since 6.0.3

 	 */

-	function __construct() {

+	function __construct() {
 		

 		add_action( 'admin_init', array( $this, 'extend_visual_composer' ) );

 

-		if ( function_exists( 'vc_add_shortcode_param' ) ) {

+		if ( function_exists( 'vc_add_shortcode_param' ) ) {
 			vc_add_shortcode_param( 'yikes_mailchimp_logo', array( $this, 'yikes_mailchimp_logo_vc_section' ) );

 		}

 	}

@@ -26,9 +26,9 @@ 
 	 *

 	 * @since 6.0.3

 	 */

-	public function extend_visual_composer() {

+	public function extend_visual_composer() {
 

-		if ( ! function_exists( 'vc_map' ) ) {

+		if ( ! function_exists( 'vc_map' ) ) {
 			return;

 		}

 

@@ -98,7 +98,7 @@ 
 	 *

 	 * @since 6.0.3

 	 */

-	public function yikes_mailchimp_logo_vc_section() {

+	public function yikes_mailchimp_logo_vc_section() {
 		return '<img style="width:250px;display:block;margin:0 auto;" src="' . YIKES_MC_URL . 'includes/images/Mailchimp_Assets/mailchimp-logo.png" title="' . __( 'Easy Forms for Mailchimp', 'yikes-inc-easy-mailchimp-extender' ) . '" />';

 	}

 

@@ -107,17 +107,17 @@ 
 	 *

 	 * @since 6.0.3

 	 */

-	public function yikes_mailchimp_retreive_user_created_forms() {

+	public function yikes_mailchimp_retreive_user_created_forms() {
 		$interface = yikes_easy_mailchimp_extender_get_form_interface();

 		$all_forms = $interface->get_all_forms();

 

 		$lists = array();

-		if ( ! empty( $all_forms ) ) {

+		if ( ! empty( $all_forms ) ) {
 			// build an array to pass to our javascript

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

+			foreach ( $all_forms as $id => $form ) {
 				$lists[ $form['form_name'] ] = $id;

 			}

-		} else {

+		} else {
 			$lists[ __( 'Please Import Some Mailchimp Lists', 'yikes-inc-easy-mailchimp-extender' ) ] = '-';

 		}

 

public/classes/checkbox-integrations.php

Braces +28 added lines, -28 removed lines

@@ -9,7 +9,7 @@ 
 /**

  * Main Checkbox Integration class.

  */

-class Yikes_Easy_MC_Checkbox_Integration_Class {

+class Yikes_Easy_MC_Checkbox_Integration_Class {
 

 	/**

 	 * The integration type.

@@ -28,10 +28,10 @@ 
 	 *

 	 * @return bool Whether the current user is subscribed to a list.

 	 */

-	public function is_user_already_subscribed( $type, $email = '' ) {

+	public function is_user_already_subscribed( $type, $email = '' ) {
 		// Make sure we have an email address to use.

-		if ( empty( $email ) ) {

-			if ( ! is_user_logged_in() ) {

+		if ( empty( $email ) ) {
+			if ( ! is_user_logged_in() ) {
 				return false;

 			}

 

@@ -40,13 +40,13 @@ 
 		}

 

 		// Ensure we have a valid email.

-		if ( ! is_email( $email ) ) {

+		if ( ! is_email( $email ) ) {
 			return false;

 		}

 

 		// Convert the integration type to a list ID.

 		$checkbox_options = get_option( 'optin-checkbox-init', '' );

-		if ( empty( $checkbox_options ) || ! isset( $checkbox_options[ $type ] ) || ! isset( $checkbox_options[ $type ]['associated-list'] ) ) {

+		if ( empty( $checkbox_options ) || ! isset( $checkbox_options[ $type ] ) || ! isset( $checkbox_options[ $type ]['associated-list'] ) ) {
 			return false;

 		}

 

@@ -54,8 +54,8 @@ 
 		$list_ids = is_array( $list_ids ) ? $list_ids : array( $list_ids );

 

 		// Go through each list...

-		foreach ( $list_ids as $list_id ) {

-			if ( ! $this->is_user_subscribed( $email, $list_id, $type ) ) {

+		foreach ( $list_ids as $list_id ) {
+			if ( ! $this->is_user_subscribed( $email, $list_id, $type ) ) {
 				return false;

 			}

 		}

@@ -74,19 +74,19 @@ 
 	 *

 	 * @return bool Whether the email is subscribed to the list.

 	 */

-	public function is_user_subscribed( $email, $list_id, $type ) {

+	public function is_user_subscribed( $email, $list_id, $type ) {
 		$email      = sanitize_email( $email );

 		$email_hash = md5( $email );

 

 		// Check the API to see the status.

 		$response = yikes_get_mc_api_manager()->get_list_handler()->get_member( $list_id, $email_hash, false );

-		if ( is_wp_error( $response ) ) {

+		if ( is_wp_error( $response ) ) {
 			$data = $response->get_error_data();

 

 			// If the error response is a 404, they are not subscribed.

-			if ( isset( $data['status'] ) && 404 === (int) $data['status'] ) {

+			if ( isset( $data['status'] ) && 404 === (int) $data['status'] ) {
 				return false;

-			} else {

+			} else {
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();

 				$error_logging->maybe_write_to_log(

 					$response->get_error_code(),

@@ -110,14 +110,14 @@ 
 	 *

 	 * @return string The HTML for the checkbox.

 	 */

-	public function yikes_get_checkbox() {

+	public function yikes_get_checkbox() {
 

 		// Get our options.

 		$checkbox_options = get_option( 'optin-checkbox-init', array() );

 		$has_list_ids     = isset( $checkbox_options[ $this->type ]['associated-list'] ) && '-' !== $checkbox_options[ $this->type ]['associated-list'];

 		$has_list_ids     = $has_list_ids && ! in_array( '-', $checkbox_options[ $this->type ]['associated-list'], true );

 

-		if ( $has_list_ids ) {

+		if ( $has_list_ids ) {
 			$label    = isset( $checkbox_options[ $this->type ]['label'] ) && ! empty( $checkbox_options[ $this->type ]['label'] ) ? trim( $checkbox_options[ $this->type ]['label'] ) : __( 'Sign me up for your mailing list.', 'yikes-inc-easy-mailchimp-extender' );

 			$checked  = 'true' === $checkbox_options[ $this->type ]['precheck'] ? 'checked="checked"' : '';

 			$before   = apply_filters( 'yikes-mailchimp-before-checkbox-html', '' );

@@ -145,11 +145,11 @@ 
 	 * @param array  $merge_vars       The array of form data to send.

 	 * @param array  $integration_vars An array of additional information that can be used to filter the subscribe request.

 	 */

-	public function subscribe_user_integration( $email, $type, $merge_vars, $integration_vars = array() ) {

+	public function subscribe_user_integration( $email, $type, $merge_vars, $integration_vars = array() ) {
 		$options = get_option( 'optin-checkbox-init', '' );

 

 		// Make sure we have a list ID.

-		if ( ! isset( $options[ $type ] ) || ! isset( $options[ $type ]['associated-list'] ) ) {

+		if ( ! isset( $options[ $type ] ) || ! isset( $options[ $type ]['associated-list'] ) ) {
 			// @todo: Throw some kind of error?

 			return;

 		}

@@ -158,7 +158,7 @@ 
 

 		// Check for an IP address.

 		$user_ip = sanitize_text_field( $_SERVER['REMOTE_ADDR'] );

-		if ( isset( $merge_vars['OPTIN_IP'] ) ) {

+		if ( isset( $merge_vars['OPTIN_IP'] ) ) {
 			$user_ip = sanitize_text_field( $merge_vars['OPTIN_IP'] );

 		}

 

@@ -174,19 +174,19 @@ 
 			'ip_signup'     => $user_ip,

 		);

 

-		foreach ( $list_ids as $list_id ) {

+		foreach ( $list_ids as $list_id ) {
 

 			$interests = isset( $options[ $type ]['interest-groups'] ) ? $options[ $type ]['interest-groups'] : array();

 			$interests = isset( $interests[ $list_id ] ) ? $interests[ $list_id ] : $interests;

 

 			// Only re-format and add interest groups if not empty.

-			if ( ! empty( $interests ) ) {

+			if ( ! empty( $interests ) ) {
 				$groups = array();

 

 				// Need to reformat interest groups array as $interest_group_ID => true.

-				foreach ( $interests as $interest ) {

-					if ( is_array( $interest ) ) {

-						foreach ( $interest as $group_id ) {

+				foreach ( $interests as $interest ) {
+					if ( is_array( $interest ) ) {
+						foreach ( $interest as $group_id ) {
 							$groups[ $group_id ] = true;

 						}

 					}

@@ -218,14 +218,14 @@ 
 			$list_id = apply_filters( 'yikes-mailchimp-checkbox-integration-list-id', $list_id, $data, $type, $integration_vars );

 

 			// Don't send an empty merge fields array.

-			if ( empty( $data['merge_fields'] ) ) {

+			if ( empty( $data['merge_fields'] ) ) {
 				unset( $data['merge_fields'] );

 			}

 

 			// Subscribe the user to the list via the API.

 			$response = yikes_get_mc_api_manager()->get_list_handler()->member_subscribe( $list_id, $id, $data );

 

-			if ( is_wp_error( $response ) ) {

+			if ( is_wp_error( $response ) ) {
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();

 				$error_logging->maybe_write_to_log(

 					$response->get_error_code(),

@@ -243,15 +243,15 @@ 
 	 *

 	 * @param WP_User $user A WP User.

 	 */

-	public function user_merge_vars( WP_User $user ) {

+	public function user_merge_vars( WP_User $user ) {
 

 		// Setup our array.

 		$merge_vars = array();

 

-		if ( ! empty( $user->first_name ) ) {

+		if ( ! empty( $user->first_name ) ) {
 			$merge_vars['FNAME'] = $user->first_name;

 		}

-		if ( ! empty( $user->last_name ) ) {

+		if ( ! empty( $user->last_name ) ) {
 			$merge_vars['LNAME'] = $user->last_name;

 		}

 

@@ -275,7 +275,7 @@ 
 	 *

 	 * @return bool True if the checkbox was checked.

 	 */

-	public function was_checkbox_checked( $type ) {

+	public function was_checkbox_checked( $type ) {
 		return isset( $_POST[ 'yikes_mailchimp_checkbox_' . $type ] ) && '1' === filter_var( $_POST[ 'yikes_mailchimp_checkbox_' . $type ], FILTER_SANITIZE_STRING );

 	}

 }

admin/partials/menu/options-sections/general-settings.php

Braces +5 added lines, -2 removed lines

@@ -22,8 +22,11 @@
 		?>
 		</span>
 	</h3>
-<?php else : ?>
-	<h3><span><?php _e( 'General Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span><?php echo $api_connection; ?></h3>
+<?php else {
+	: ?>
+	<h3><span><?php _e( 'General Settings' , 'yikes-inc-easy-mailchimp-extender' );
+}
+?></span><?php echo $api_connection; ?></h3>
 <?php endif; ?>
 
 <div class="inside">