yikesinc / yikes-inc-easy-mailchimp-extender

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

Spacing +11 added lines, -11 removed lines

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

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

Spacing +9 added lines, -9 removed lines

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

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

Spacing +3 added lines, -3 removed lines

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

 				$old_blog = $wpdb->blogid;

 				// Get all blog ids

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

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

 				foreach ( $blogids as $blog_id ) {

 					switch_to_blog( $blog_id );

 					self::_activate_yikes_easy_mailchimp( $wpdb );

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

 		UNIQUE KEY id (id)

 		) $charset_collate;";

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

-		dbDelta($sql);

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

+		dbDelta( $sql );

 

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

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

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

Spacing +1 added lines, -1 removed lines

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

 			// build an array to pass to our javascript

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

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

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

 			}

 		} else {

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

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

Spacing +3 added lines, -3 removed lines

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

 	 */

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

-		$hooks[] = array(

+		$hooks[ ] = array(

 			'hook'          => $hook,

 			'component'     => $component,

 			'callback'      => $callback,

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

 	public function run() {

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

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

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

 		}

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

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

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

 		}

 	}

 }
\ No newline at end of file

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

Spacing +53 added lines, -53 removed lines

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

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

Spacing +22 added lines, -22 removed lines

@@ -56,9 +56,9 @@ 
 		new YIKES_Inc_Easy_MailChimp_Public_Ajax();
 
 		// 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
@@ -93,15 +93,15 @@ 
 	**/
 	public function load_checkbox_integration_classes() {
 		// store our options
-		$integrations = get_option( 'optin-checkbox-init' , array() );
-		if( ! empty( $integrations ) && is_array( $integrations ) ) {
+		$integrations = get_option( 'optin-checkbox-init', array() );
+		if ( ! empty( $integrations ) && is_array( $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';
 				}
 			}
 		}
@@ -115,7 +115,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;
@@ -128,19 +128,19 @@ 
 	*	@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;
 						}
@@ -168,7 +168,7 @@ 
 	 */
 	public static function yikes_retrieve_form_settings( $form_id ) {
 		// if no form id, abort
-		if( ! $form_id ) {
+		if ( ! $form_id ) {
 			return array();
 		}
 
@@ -197,13 +197,13 @@ 
 			return;
 		}
 		// trim trailing period
-		if ( isset( $form_settings['error_messages']['update-link'] ) && ! empty( $form_settings['error_messages']['update-link'] ) ) {
-			$response_text = $form_settings['error_messages']['update-link'];
+		if ( isset( $form_settings[ 'error_messages' ][ 'update-link' ] ) && ! empty( $form_settings[ 'error_messages' ][ 'update-link' ] ) ) {
+			$response_text = $form_settings[ 'error_messages' ][ 'update-link' ];
 			// extract the link text
 			preg_match( '/\[link].*?\[\/link\]/', $response_text, $link_text );
 			if ( $link_text && ! empty( $link_text ) ) {
 				// Extract the custom link text ([link]*[/link])
-				$custom_link_text = str_replace( '[/link]', '', str_replace( '[link]', '', str_replace( 'click to send yourself an update link', $link_text[0], $link ) ) );
+				$custom_link_text = str_replace( '[/link]', '', str_replace( '[link]', '', str_replace( 'click to send yourself an update link', $link_text[ 0 ], $link ) ) );
 				// Replace the link text, with our custom link text
 				$response_text = str_replace( $link_text, $custom_link_text, $response_text );
 			}
@@ -232,8 +232,8 @@ 
 		}
 
 		// trim trailing period
-		if ( isset( $form_settings['error_messages']['already-subscribed'] ) && ! empty( $form_settings['error_messages']['already-subscribed'] ) ) {
-			$response_text = str_replace( '[email]', $email, $form_settings['error_messages']['already-subscribed'] );
+		if ( isset( $form_settings[ 'error_messages' ][ 'already-subscribed' ] ) && ! empty( $form_settings[ 'error_messages' ][ 'already-subscribed' ] ) ) {
+			$response_text = str_replace( '[email]', $email, $form_settings[ 'error_messages' ][ 'already-subscribed' ] );
 		}
 		// Return our new string
 		return $response_text;

admin/partials/dashboard-widgets/templates/stats-list-template.php

Spacing +21 added lines, -21 removed lines

@@ -2,7 +2,7 @@ 
 /* The template file for displaying our stats in the Admin dashboard widget */
 
 if ( isset( $list_data ) ) {
-	if ( isset( $list_data['id'] ) ) {
+	if ( isset( $list_data[ 'id' ] ) ) {
 
 	// When a user selects a list from the dropdown, capture the array value here
 	$list = $list_data;
@@ -13,12 +13,12 @@ 
 		// Get the list IDs, capture the first list ID
 		$first_list_id = '';
 		$list_ids = array_keys( $list_data );
-		if ( is_array( $list_ids ) && isset( $list_ids[0] ) ) {
-			$first_list_id = $list_ids[0];
+		if ( is_array( $list_ids ) && isset( $list_ids[ 0 ] ) ) {
+			$first_list_id = $list_ids[ 0 ];
 		}
 
 		// Set our $list value to the first list in the list_data array
-		if ( isset( $list_data[ $first_list_id ] ) && is_array( $list_data[ $first_list_id ] ) && isset( $list_data[ $first_list_id ]['id'] ) ) {
+		if ( isset( $list_data[ $first_list_id ] ) && is_array( $list_data[ $first_list_id ] ) && isset( $list_data[ $first_list_id ][ 'id' ] ) ) {
 			$list = $list_data[ $first_list_id ];
 		}
 	}
@@ -31,36 +31,36 @@ 
 
 ?>
 <section id="yikes-easy-mc-widget-stat-holder">
-	<h3><?php echo $list['name']; ?> <small><a href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-view-list&list-id=' . $list['id'] . '' ) ); ?>" title="<?php _e( 'view List' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'view list' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></h3>
+	<h3><?php echo $list[ 'name' ]; ?> <small><a href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-view-list&list-id=' . $list[ 'id' ] . '' ) ); ?>" title="<?php _e( 'view List', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'view list', 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></h3>
 	
 	<table class="yikes-easy-mc-stats-table">
 		<thead class="yikes-easy-mc-hidden">
 			<tr>
-				<th><?php _e( 'Subscribers' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-				<th><?php _e( 'Unsubscribed' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-				<th><?php _e( 'New Since Send' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>	
-				<th><?php _e( 'Avg. Sub. Rate' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+				<th><?php _e( 'Subscribers', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+				<th><?php _e( 'Unsubscribed', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+				<th><?php _e( 'New Since Send', 'yikes-inc-easy-mailchimp-extender' ); ?></th>	
+				<th><?php _e( 'Avg. Sub. Rate', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
 			</tr>
 		</thead>
 		<tbody>
 			<tr class="yikes-easy-mc-table-stats-tr yikes-easy-mc-table-stats-tr-first">
-				<td title="<?php _e( 'Number of active subscribers.' , 'yikes-inc-easy-mailchimp-extender' ); ?>">
-					<p class="yikes-easy-mc-dashboard-stat"><?php echo $list['stats']['member_count']; ?></p>
-						<p class="yikes-easy-mc-stat-list-label"><?php _e( 'subscribers' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+				<td title="<?php _e( 'Number of active subscribers.', 'yikes-inc-easy-mailchimp-extender' ); ?>">
+					<p class="yikes-easy-mc-dashboard-stat"><?php echo $list[ 'stats' ][ 'member_count' ]; ?></p>
+						<p class="yikes-easy-mc-stat-list-label"><?php _e( 'subscribers', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 				</td>
-				<td title="<?php _e( 'Number of users who have unsusbscribed.' , 'yikes-inc-easy-mailchimp-extender' ); ?>">
-					<p class="yikes-easy-mc-dashboard-stat"><?php echo $list['stats']['unsubscribe_count']; ?></p>
-						<p class="yikes-easy-mc-stat-list-label"><?php _e( 'unsubscribed' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+				<td title="<?php _e( 'Number of users who have unsusbscribed.', 'yikes-inc-easy-mailchimp-extender' ); ?>">
+					<p class="yikes-easy-mc-dashboard-stat"><?php echo $list[ 'stats' ][ 'unsubscribe_count' ]; ?></p>
+						<p class="yikes-easy-mc-stat-list-label"><?php _e( 'unsubscribed', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 				</td>
 			</tr>
 			<tr class="yikes-easy-mc-table-stats-tr  yikes-easy-mc-table-stats-tr-second">
-				<td title="<?php _e( 'Number of new subscribers since the last campaign was sent.' , 'yikes-inc-easy-mailchimp-extender' ); ?>">
-					<p class="yikes-easy-mc-dashboard-stat"><?php echo $list['stats']['member_count_since_send']; ?></p>
-						<p class="yikes-easy-mc-stat-list-label"><?php _e( 'new since send' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+				<td title="<?php _e( 'Number of new subscribers since the last campaign was sent.', 'yikes-inc-easy-mailchimp-extender' ); ?>">
+					<p class="yikes-easy-mc-dashboard-stat"><?php echo $list[ 'stats' ][ 'member_count_since_send' ]; ?></p>
+						<p class="yikes-easy-mc-stat-list-label"><?php _e( 'new since send', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 				</td>
-				<td title="<?php _e( 'Average number of subscribers per month.' , 'yikes-inc-easy-mailchimp-extender' ); ?>">
-					<p class="yikes-easy-mc-dashboard-stat"><?php echo $list['stats']['avg_sub_rate']; ?></p>
-						<p class="yikes-easy-mc-stat-list-label"><?php _e( 'avg. sub. rate' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+				<td title="<?php _e( 'Average number of subscribers per month.', 'yikes-inc-easy-mailchimp-extender' ); ?>">
+					<p class="yikes-easy-mc-dashboard-stat"><?php echo $list[ 'stats' ][ 'avg_sub_rate' ]; ?></p>
+						<p class="yikes-easy-mc-stat-list-label"><?php _e( 'avg. sub. rate', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 				</td>
 			</tr>
 		</tbody>

includes/third-party-integrations/third-party-init.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 		// required..*
 		include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
 		/* Visual Composer */
-		if( is_plugin_active( 'js_composer/js_composer.php' ) ) {
+		if ( is_plugin_active( 'js_composer/js_composer.php' ) ) {
 			new YIKES_MailChimp_Visual_Composer_Extension();
 		}
 	}