yikesinc / yikes-inc-easy-mailchimp-extender

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' , '' );

Braces +2 added lines, -1 removed lines

@@ -138,7 +138,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' ) {

Spacing +36 added lines, -36 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
@@ -100,15 +100,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';
 				}
 			}
 		}
@@ -122,7 +122,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;
@@ -135,18 +135,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;
 						}
@@ -162,27 +162,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;
 		}
@@ -209,13 +209,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 );
 			}
@@ -242,8 +242,8 @@ 
 			return;
 		}
 		// 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;

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(

includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php

Spacing +14 added lines, -14 removed lines

@@ -51,19 +51,19 @@ 
 	*	@returned_error 
 	*	@error_type - what was running when the error occured ie (new user subscription, remove user etc)
 	*/
-	public function yikes_easy_mailchimp_write_to_error_log( $returned_error , $error_type , $page='' ) {
+	public function yikes_easy_mailchimp_write_to_error_log( $returned_error, $error_type, $page = '' ) {
 		
 		// confirm error logging is toggled on, else lets exit
-		if( get_option( 'yikes-mailchimp-debug-status' , '' )  != '1' ) {
+		if ( get_option( 'yikes-mailchimp-debug-status', '' ) != '1' ) {
 			return;
 		}
 		
-		$contents = file_get_contents( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php' , true );
+		$contents = file_get_contents( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php', true );
 		
 		// if we pass in a custom page, don't set things up
-		if( empty( $page ) ) {
+		if ( empty( $page ) ) {
 			// get the current page, admin or front end?
-			if( is_admin() ) {
+			if ( is_admin() ) {
 				$page = __( 'Admin', 'yikes-inc-easy-mailchimp-extender' );
 			} else {
 				$page = __( 'Front End', 'yikes-inc-easy-mailchimp-extender' );
@@ -79,14 +79,14 @@ 
 					</label>
 				</td>
 				<td>
-					<?php _e( 'Page:' , 'yikes-inc-easy-mailchimp-extender' ); echo ' ' . $page; ?> || <?php _e( 'Type:' , 'yikes-inc-easy-mailchimp-extender' ); echo ' ' . $error_type; ?> || <?php _e( 'Time:' , 'yikes-inc-easy-mailchimp-extender' ); echo ' ' . date( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ) , current_time('timestamp') ); ?>
+					<?php _e( 'Page:', 'yikes-inc-easy-mailchimp-extender' ); echo ' ' . $page; ?> || <?php _e( 'Type:', 'yikes-inc-easy-mailchimp-extender' ); echo ' ' . $error_type; ?> || <?php _e( 'Time:', 'yikes-inc-easy-mailchimp-extender' ); echo ' ' . date( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), current_time( 'timestamp' ) ); ?>
 				</td>
 			</tr>
 		<?php
 		$new_contents = ob_get_clean() . $contents;
 		
 		// file put contents $returned error + other data
-		if( file_exists( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php' ) ) {
+		if ( file_exists( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php' ) ) {
 			file_put_contents( 
 				YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php',
 				$new_contents
@@ -102,12 +102,12 @@ 
 	*/	
 	public function yikes_easy_mailchimp_generate_error_log_table() {		
 		// ensure file_get_contents exists
-		if( function_exists( 'file_get_contents' ) ) {	
+		if ( function_exists( 'file_get_contents' ) ) {	
 			// confirm that our file exists
-			if( file_exists( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php' ) ) {
-				$error_log_contents = file_get_contents( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php' , true );							
-				if( $error_log_contents === FALSE ) {
-					return _e( 'File get contents not available' , 'yikes-inc-easy-mailchimp-extender' );
+			if ( file_exists( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php' ) ) {
+				$error_log_contents = file_get_contents( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php', true );							
+				if ( $error_log_contents === FALSE ) {
+					return _e( 'File get contents not available', 'yikes-inc-easy-mailchimp-extender' );
 				}
 				if ( $error_log_contents != '' ) {
 					// return $error_log_contents;
@@ -118,7 +118,7 @@ 
 						<tr class="error-log-tr">
 							<td class="row-title colspanchange" colspan="2">
 								<strong><span class='dashicons dashicons-no-alt'></span> <?php _e( 'No errors logged.', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-								<?php if( get_option( 'yikes-mailchimp-debug-status' , '' ) == '' ) { ?>
+								<?php if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '' ) { ?>
 									<br />
 									<p class="to-start-logging-errors-notice"><em><?php _e( "To start logging errors toggle on the 'Enable Debugging' option above.", 'yikes-inc-easy-mailchimp-extender' ); ?></em></p>
 								<?php } ?>
@@ -146,7 +146,7 @@ 
 									);
 									?>
 									<form id="create-error-log" method="POST" action="<?php echo $url; ?>">
-										<?php submit_button( __( 'Attempt to Create Error Log' , 'yikes-inc-easy-mailchimp-extender' ) , 'secondary' , '' , '' , array() ); ?>
+										<?php submit_button( __( 'Attempt to Create Error Log', 'yikes-inc-easy-mailchimp-extender' ), 'secondary', '', '', array() ); ?>
 									</form>
 									
 								</p>

Braces +4 added lines, -3 removed lines

@@ -100,9 +100,9 @@ 
 	*
 	*  @since 5.6
 	*/	
-	public function yikes_easy_mailchimp_generate_error_log_table() {		
+	public function yikes_easy_mailchimp_generate_error_log_table() {
 		// ensure file_get_contents exists
-		if( function_exists( 'file_get_contents' ) ) {	
+		if( function_exists( 'file_get_contents' ) ) {
 			// confirm that our file exists
 			if( file_exists( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php' ) ) {
 				$error_log_contents = file_get_contents( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php' , true );							
@@ -154,7 +154,8 @@ 
 						</tr>
 					<?php
 			}
-		} else { // if file_get_contents is disabled server side
+		} else {
+// if file_get_contents is disabled server side
 			?>
 				<!-- table body -->
 				<tr>

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

Spacing +5 added lines, -5 removed lines

@@ -35,7 +35,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 );
@@ -91,13 +91,13 @@ 
 		custom_fields LONGTEXT 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
-		if( !get_option( 'yikes_easy_mailchimp_activation_date' ) || get_option( 'yikes_easy_mailchimp_activation_date' ) == '' ) {
-			update_option( 'yikes_easy_mailchimp_activation_date' , strtotime( 'now' ) );
+		if ( ! get_option( 'yikes_easy_mailchimp_activation_date' ) || get_option( 'yikes_easy_mailchimp_activation_date' ) == '' ) {
+			update_option( 'yikes_easy_mailchimp_activation_date', strtotime( 'now' ) );
 		}
 		
 	}

Braces +2 added lines, -1 removed lines

@@ -45,7 +45,8 @@
 				return;
 			}   
 			self::_activate_yikes_easy_mailchimp( $wpdb );
-		} else { /* end network activate */
+		} else {
+/* end network activate */
 			self::_activate_yikes_easy_mailchimp( $wpdb );
 		}
 	}

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

Indentation +19 added lines, -19 removed lines

@@ -6,26 +6,26 @@ 
 class YIKES_MailChimp_Visual_Composer_Extension {
 	
 	/**
-	*	Constructor
-	*	@since 6.0.3
-	*/
+	 *	Constructor
+	 *	@since 6.0.3
+	 */
 	function __construct() {
 		add_action( 'admin_init', array( $this, 'extend_visual_composer' ) );
 		add_shortcode_param( 'yikes_mailchimp_logo', array( $this, 'yikes_mailchimp_logo_vc_section' ) );
 	}
 	
 	/**
-	*	Extend Visual Composer with custom button
-	*	@since 6.0.3
-	*/
+	 *	Extend Visual Composer with custom button
+	 *	@since 6.0.3
+	 */
 	public function extend_visual_composer() {
 		vc_map( array(
-		   "name" => __( "Easy Forms for MailChimp", "yikes-inc-easy-mailchimp-extender" ),
-		   "base" => "yikes-mailchimp",
-   		   "icon" => YIKES_MC_URL . "includes/images/Welcome_Page/yikes-mailchimp-welcome-logo.png", // Simply pass url to your icon here
-		   "category" => 'Content', // where is this buutton being displayed
-		   "description" => __( "Display a MailChimp Opt-In form", "yikes-inc-easy-mailchimp-extender" ), // add a description
-		   "params" => array(
+			"name" => __( "Easy Forms for MailChimp", "yikes-inc-easy-mailchimp-extender" ),
+			"base" => "yikes-mailchimp",
+				"icon" => YIKES_MC_URL . "includes/images/Welcome_Page/yikes-mailchimp-welcome-logo.png", // Simply pass url to your icon here
+			"category" => 'Content', // where is this buutton being displayed
+			"description" => __( "Display a MailChimp Opt-In form", "yikes-inc-easy-mailchimp-extender" ), // add a description
+			"params" => array(
 				array(
 					"type" => "yikes_mailchimp_logo",
 					"holder" => "div",
@@ -75,22 +75,22 @@ 
 					"value" => __( "Submit", "yikes-inc-easy-mailchimp-extender" ),
 					"description" => __( "Enter a title to display", "yikes-inc-easy-mailchimp-extender" )
 				)
-		   )
+			)
 		) );
 	}
 	
 	/**
-	*	Custom Callback Section
-	*	@since 6.0.3
-	*/
+	 *	Custom Callback Section
+	 *	@since 6.0.3
+	 */
 	public function yikes_mailchimp_logo_vc_section( $settings, $value ) {
 		return '<img style="width:250px;display:block;margin:0 auto;" src="' . YIKES_MC_URL . 'includes/images/Welcome_Page/mailchimp-logo.png" title="' . __( 'Easy Forms for MailChimp by YIKES', 'yikes-inc-easy-mailchimp-extender' ) . '" />';
 	}
 	
 	/**
-	*	Retreive a list of forms created by the user that they can select from in the dropdown
-	*	@since 6.0.3
-	*/
+	 *	Retreive a list of forms created by the user that they can select from in the dropdown
+	 *	@since 6.0.3
+	 */
 	public function yikes_mailchimp_retreive_user_created_forms() {
 		global $wpdb;
 		$list_data = $wpdb->get_results( 'SELECT * FROM ' . $wpdb->prefix . 'yikes_easy_mc_forms', ARRAY_A );

Spacing +4 added lines, -4 removed lines

@@ -95,13 +95,13 @@
 		global $wpdb;
 		$list_data = $wpdb->get_results( 'SELECT * FROM ' . $wpdb->prefix . 'yikes_easy_mc_forms', ARRAY_A );
 		$lists = array();
-		if( !empty( $list_data ) ) {	
+		if ( ! empty( $list_data ) ) {	
 			// build an array to pass to our javascript
-			foreach( $list_data as $form ) {
-				$lists[$form['form_name']] = $form['id'];
+			foreach ( $list_data as $form ) {
+				$lists[ $form[ 'form_name' ] ] = $form[ 'id' ];
 			}
 		} else {
-			$lists[__( 'Please Import Some MailChimp Lists' , 'yikes-inc-easy-mailchimp-extender' )] = '-';
+			$lists[ __( 'Please Import Some MailChimp Lists', 'yikes-inc-easy-mailchimp-extender' ) ] = '-';
 		}
 		return $lists;
 	}

Braces +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
 		global $wpdb;
 		$list_data = $wpdb->get_results( 'SELECT * FROM ' . $wpdb->prefix . 'yikes_easy_mc_forms', ARRAY_A );
 		$lists = array();
-		if( !empty( $list_data ) ) {	
+		if( !empty( $list_data ) ) {
 			// build an array to pass to our javascript
 			foreach( $list_data as $form ) {
 				$lists[$form['form_name']] = $form['id'];