yikesinc / yikes-inc-easy-mailchimp-extender

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,15 +28,15 @@ 
 	 * @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_transient( 'yikes-easy-mailchimp-list-data' );

includes/add_ons/eu-compliance.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 
 	<div class="addon-footer-wrap give-clearfix">
 		<a href="<?php echo esc_attr( $permalink ); ?>" title="<?php echo esc_attr( $add_on_title ); ?>" class="button-secondary" target="_blank">
-			<?php esc_attr_e( 'View Add-on' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+			<?php esc_attr_e( 'View Add-on', 'yikes-inc-easy-mailchimp-extender' ); ?>
 		<span class="dashicons dashicons-external"></span></a>
 	</div>
 

includes/add_ons/incentives.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 
 	<div class="addon-footer-wrap give-clearfix">
 		<a href="<?php echo esc_attr( $permalink ); ?>" title="<?php echo esc_attr( $add_on_title ); ?>" class="button-secondary" target="_blank">
-			<?php esc_attr_e( 'View Add-on' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+			<?php esc_attr_e( 'View Add-on', 'yikes-inc-easy-mailchimp-extender' ); ?>
 		<span class="dashicons dashicons-external"></span></a>
 	</div>
 

includes/add_ons/customizer.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 
 	<div class="addon-footer-wrap give-clearfix">
 		<a href="<?php echo esc_attr( $permalink ); ?>" title="<?php echo esc_attr( $add_on_title ); ?>" class="button-secondary" target="_blank">
-			<?php esc_attr_e( 'View Add-on' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+			<?php esc_attr_e( 'View Add-on', 'yikes-inc-easy-mailchimp-extender' ); ?>
 		<span class="dashicons dashicons-external"></span></a>
 	</div>
 

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

Indentation +5 added lines, -5 removed lines

@@ -70,10 +70,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' );
@@ -90,7 +90,7 @@ 
 	 *	load our checkbox classes
 	 *
 	 *	@since 6.0.0
-	**/
+	 **/
 	public function load_checkbox_integration_classes() {
 		// store our options
 		$integrations = get_option( 'optin-checkbox-init' , array() );

Braces +2 added lines, -1 removed lines

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

Spacing +22 added lines, -22 removed lines

@@ -57,9 +57,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
@@ -94,15 +94,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';
 				}
 			}
 		}
@@ -116,7 +116,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;
@@ -129,19 +129,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;
 						}
@@ -169,7 +169,7 @@ 
 	 */
 	public static function yikes_retrieve_form_settings( $form_id ) {
 		// if no form id, abort
-		if( ! $form_id ) {
+		if ( ! $form_id ) {
 			return array();
 		}
 
@@ -198,13 +198,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 );
 			}
@@ -233,8 +233,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/helpers/free-support.php

Spacing +3 added lines, -3 removed lines

@@ -5,10 +5,10 @@ 
 	<div id="col-left">
 
 		<div class="col-wrap">
-			<h1><span class="dashicons dashicons-wordpress-alt support-page-wordpress-font"></span>&nbsp;<?php _e( 'WordPress.org Plugin Directory' , 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
+			<h1><span class="dashicons dashicons-wordpress-alt support-page-wordpress-font"></span>&nbsp;<?php _e( 'WordPress.org Plugin Directory', 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
 			<div class="inside">
 				<p><?php _e( 'Use your WordPress.org username to submit support requests on the WordPress Directory support forum.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
-				<img class="support-page-logo" src="<?php echo YIKES_MC_URL; ?>includes/images/Support_Page/wordpress-issue-screenshot.png" title="<?php esc_attr_e( 'WordPress.org Issue Tracker Screenshot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" >
+				<img class="support-page-logo" src="<?php echo YIKES_MC_URL; ?>includes/images/Support_Page/wordpress-issue-screenshot.png" title="<?php esc_attr_e( 'WordPress.org Issue Tracker Screenshot', 'yikes-inc-easy-mailchimp-extender' ); ?>" >
 				<a href="https://wordpress.org/support/plugin/yikes-inc-easy-mailchimp-extender" target="_blank" class="button-secondary support-page-button"><?php _e( 'Submit a New WordPress.org Support Request', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 			</div>
 		</div>
@@ -60,7 +60,7 @@ 
 						printf( '<h2>' . esc_attr__( 'Popular Knowledge Base Articles', 'yikes-inc-easy-mailchimp-extender' ) . '</h2>' );
 						printf( '<ol>' );
 						foreach ( $knowledge_base_links as $kb_link ) {
-							echo wp_kses_post( '<li><a href="' . esc_url( $kb_link['href'] ) . '" title="' . esc_attr( $kb_link['title'] ) . '" target="_blank">' . esc_attr( $kb_link['title'] ) . '</a></li>' );
+							echo wp_kses_post( '<li><a href="' . esc_url( $kb_link[ 'href' ] ) . '" title="' . esc_attr( $kb_link[ 'title' ] ) . '" target="_blank">' . esc_attr( $kb_link[ 'title' ] ) . '</a></li>' );
 						}
 						printf( '</ol>' );
 					}

admin/partials/helpers/premium-support.php

Spacing +14 added lines, -14 removed lines

@@ -6,7 +6,7 @@ 
 			<h2 class="premium-support-title"><?php _e( 'Priority & Add-on Support', 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
 
 			<?php
-				if ( isset( $_POST['submit-premium-support-request'] ) ) {
+				if ( isset( $_POST[ 'submit-premium-support-request' ] ) ) {
 			?>
 					<h4><?php _e( 'Success!', 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
 					<p><?php _e( 'We have received your support request and will get in touch shortly regarding your issue.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -15,7 +15,7 @@ 
 			?>
 
 			<!-- Premium Support Form -->
-			<form id="premium-support-form" method="post" action="<?php echo esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-support#premium-support-form' ) ); ?>" <?php echo (isset($_POST['submit-premium-support-request'])) ? 'class="support-form-hidden"' : ''; ?>>
+			<form id="premium-support-form" method="post" action="<?php echo esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-support#premium-support-form' ) ); ?>" <?php echo ( isset( $_POST[ 'submit-premium-support-request' ] ) ) ? 'class="support-form-hidden"' : ''; ?>>
 
 				<label><?php _e( 'Add-On:', 'yikes-inc-easy-mailchimp-extender' ); ?>
 					<select name="license_key" id="license-key">
@@ -25,13 +25,13 @@ 
 								// get the license for the respective extension
 								$options = get_option( 'yikes-mailchimp-' . $extension . '-settings', array() );
 
-								if ( isset( $options['license'] ) && $options['status'] == 'valid' ) {
-									echo '<option data-plugin-slug="' . esc_attr( $extension ) . '" data-plugin-name="' . esc_attr( ucwords( str_replace( '-', ' ', $extension ) ) ) . '" value="' . esc_attr( trim( $options['license'] ) ) . '">' . ucwords( str_replace( '-', ' ', $extension ) ) . ' ' . '</option>';
+								if ( isset( $options[ 'license' ] ) && $options[ 'status' ] == 'valid' ) {
+									echo '<option data-plugin-slug="' . esc_attr( $extension ) . '" data-plugin-name="' . esc_attr( ucwords( str_replace( '-', ' ', $extension ) ) ) . '" value="' . esc_attr( trim( $options[ 'license' ] ) ) . '">' . ucwords( str_replace( '-', ' ', $extension ) ) . ' ' . '</option>';
 								}
 							}
 						?>
 					</select>
-					<p class="description"><?php _e( 'Select the add-on that you are looking for help with.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+					<p class="description"><?php _e( 'Select the add-on that you are looking for help with.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
 					<input type="hidden" name="plugin-slug" id="plugin-slug" value="">
 					<input type="hidden" name="plugin-name" id="plugin-name" value="">
@@ -39,31 +39,31 @@ 
 
 				<label><?php _e( 'Name:', 'yikes-inc-easy-mailchimp-extender' ); ?>
 					<input type="text" name="user-name" required>
-					<p class="description"><?php _e( 'Enter your name.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+					<p class="description"><?php _e( 'Enter your name.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 				</label>
 
 				<label><?php _e( 'Contact Email:', 'yikes-inc-easy-mailchimp-extender' ); ?>
 					<input type="email" name="user-email" required>
-					<p class="description"><?php _e( 'Enter the email address you would prefer to be contact at.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+					<p class="description"><?php _e( 'Enter the email address you would prefer to be contact at.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 				</label>
 
 				<label><?php _e( 'Topic:', 'yikes-inc-easy-mailchimp-extender' ); ?>
 					<input type="text" name="support-topic" required>
-					<p class="description"><?php _e( 'Pleae enter the topic of your support request.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+					<p class="description"><?php _e( 'Pleae enter the topic of your support request.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 				</label>
 
 				<label><?php _e( 'Priority:', 'yikes-inc-easy-mailchimp-extender' ); ?>
 					<select name="support-priority">
-						<option value="1"><?php _e( 'Low' , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
-						<option value="2"><?php _e( 'Medium' , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
-						<option value="3"><?php _e( 'High' , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
-						<option value="4"><?php _e( 'Urgent' , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
+						<option value="1"><?php _e( 'Low', 'yikes-inc-easy-mailchimp-extender' ); ?></option>
+						<option value="2"><?php _e( 'Medium', 'yikes-inc-easy-mailchimp-extender' ); ?></option>
+						<option value="3"><?php _e( 'High', 'yikes-inc-easy-mailchimp-extender' ); ?></option>
+						<option value="4"><?php _e( 'Urgent', 'yikes-inc-easy-mailchimp-extender' ); ?></option>
 					</select>
-					<p class="description"><?php _e( 'Select the priority of this ticket.' , 'yikes-inc-easy-mailchimp-extender' ); ?><em><?php _e( 'Note: Please do not abuse "urgent".' , 'yikes-inc-easy-mailchimp-extender' ); ?></em></p>
+					<p class="description"><?php _e( 'Select the priority of this ticket.', 'yikes-inc-easy-mailchimp-extender' ); ?><em><?php _e( 'Note: Please do not abuse "urgent".', 'yikes-inc-easy-mailchimp-extender' ); ?></em></p>
 				</label>
 				<label><?php _e( 'Issue:', 'yikes-inc-easy-mailchimp-extender' ); ?>
 					<?php wp_editor( '', 'support-content', array( 'textarea_name' => 'support-content', 'media_buttons' => false ) ); ?>
-					<p class="description"><?php _e( 'Enter as much detail about the issue you are encontering as possible. After we make initial contact you can attach any screenshots necessary.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+					<p class="description"><?php _e( 'Enter as much detail about the issue you are encontering as possible. After we make initial contact you can attach any screenshots necessary.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 				</label>
 
 				<input type="hidden" name="action" value="yikes-support-request">

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

Spacing +4 added lines, -4 removed lines

@@ -174,7 +174,7 @@ 
 		$email_field = apply_filters( 'yikes-easy-mailchimp-email-address-field', $email_field, $list_id );
 
 		array_unshift( $merge_fields, $email_field );
-		$merge_object['merge_fields'] = $merge_fields;
+		$merge_object[ 'merge_fields' ] = $merge_fields;
 		set_transient( "yikes_eme_merge_variables_{$list_id}", $merge_object, HOUR_IN_SECONDS );
 
 		return $merge_object;
@@ -195,8 +195,8 @@ 
 	* @return array | WP_Error
 	*/
 	public function update_merge_field( $list_id, $field_id, $field_data, $clear_transient = true ) {
-		$path	= "{$this->base_path}/{$list_id}/merge-fields/{$field_id}";
-		$field	= $this->patch_to_api( $path, $field_data );
+		$path = "{$this->base_path}/{$list_id}/merge-fields/{$field_id}";
+		$field = $this->patch_to_api( $path, $field_data );
 
 		if ( is_wp_error( $field ) ) {
 			return $field;
@@ -244,7 +244,7 @@ 
 				return $interests;
 			}
 
-			$category['items'] = $interests;
+			$category[ 'items' ] = $interests;
 		}
 
 		set_transient( "yikes_eme_interest_categories_{$list_id}", $categories, HOUR_IN_SECONDS );

Indentation +13 added lines, -13 removed lines

@@ -181,19 +181,19 @@
 	}
 
 	/**
-	* Update a merge field for a particular list
-	*
-	* @author Kevin Utz
-	*
-	* @since 6.3.3
-	*
-	* @param string | $list_id			| The ID of the Mailchimp list
-	* @param string | $field_id			| The ID of the merge field
-	* @param array  | $field_data		| An array of field data constituting the body of our API request
-	* @param bool	| $clear_transient	| Flag whether we should delete the transients associated with this list
-	*
-	* @return array | WP_Error
-	*/
+	 * Update a merge field for a particular list
+	 *
+	 * @author Kevin Utz
+	 *
+	 * @since 6.3.3
+	 *
+	 * @param string | $list_id			| The ID of the Mailchimp list
+	 * @param string | $field_id			| The ID of the merge field
+	 * @param array  | $field_data		| An array of field data constituting the body of our API request
+	 * @param bool	| $clear_transient	| Flag whether we should delete the transients associated with this list
+	 *
+	 * @return array | WP_Error
+	 */
 	public function update_merge_field( $list_id, $field_id, $field_data, $clear_transient = true ) {
 		$path	= "{$this->base_path}/{$list_id}/merge-fields/{$field_id}";
 		$field	= $this->patch_to_api( $path, $field_data );

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

Spacing +8 added lines, -8 removed lines

@@ -122,10 +122,10 @@ 
 	*	@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;

 		}

 		

@@ -171,12 +171,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( $this->error_log_file_path ) ) {

+			if ( file_exists( $this->error_log_file_path ) ) {

 				$error_log_contents = file_get_contents( $this->error_log_file_path, true );							

-				if( $error_log_contents === FALSE ) {

-					return _e( 'File get contents not available' , 'yikes-inc-easy-mailchimp-extender' );

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

@@ -187,7 +187,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 } ?>

@@ -215,7 +215,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 +22 added lines, -21 removed lines

@@ -25,7 +25,7 @@ 
  * @subpackage Yikes_Inc_Easy_Mailchimp_Extender/includes

  * @author     YIKES Inc. <plugins@yikesinc.com>

  */

-class Yikes_Inc_Easy_Mailchimp_Error_Logging {

+class Yikes_Inc_Easy_Mailchimp_Error_Logging {
 

 	/**

 	 * Whether we're doing debugging.

@@ -57,7 +57,7 @@ 
 	 *

 	 * @since    1.0.0

 	 */

-	public function __construct() {

+	public function __construct() {
 		$this->is_debugging          = WP_DEBUG || (string) get_option( 'yikes-mailchimp-debug-status', '' ) === '1';

 		$this->error_log_file_path   = $this->get_error_log_file_path();

 		$this->error_log_folder_path = $this->get_error_log_folder();

@@ -78,35 +78,35 @@ 
 	 * @param string $error_type     The error type.

 	 * @param string $page           The page information.

 	 */

-	public function maybe_write_to_log( $returned_error, $error_type, $page = '' ) {

-		if ( ! $this->is_debugging ) {

+	public function maybe_write_to_log( $returned_error, $error_type, $page = '' ) {
+		if ( ! $this->is_debugging ) {
 			return;

 		}

 

 		$this->yikes_easy_mailchimp_write_to_error_log( $returned_error, $error_type, $page );

 	}

 

-	public function create_error_log_folder() {

+	public function create_error_log_folder() {
 

 		// If our directory doesn't exist, make it.

-		if ( ! file_exists( $this->get_error_log_folder() ) ) {

+		if ( ! file_exists( $this->get_error_log_folder() ) ) {
 			mkdir( $this->get_error_log_folder() );

 		}

 	}

 

-	public function create_error_log_file() {

+	public function create_error_log_file() {
 

 		// If our error log doesn't exist, make it.

-		if ( ! file_exists( $this->error_log_file_path ) ) {

+		if ( ! file_exists( $this->error_log_file_path ) ) {
 			file_put_contents( $this->error_log_file_path, '' );

 		}

 	}

 

-	private function get_error_log_folder() {

+	private function get_error_log_folder() {
 		return WP_CONTENT_DIR . '/uploads/yikes-log/';

 	}

 

-	private function get_error_log_file_path() {

+	private function get_error_log_file_path() {
 		return WP_CONTENT_DIR . '/uploads/yikes-log/yikes-easy-mailchimp-error-log.txt';

 	}

 	

@@ -122,17 +122,17 @@ 
 	*	@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( $this->error_log_file_path, 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?

 			$page = is_admin() ? __( 'Admin', 'yikes-inc-easy-mailchimp-extender' ) : __( 'Front End', 'yikes-inc-easy-mailchimp-extender' );

@@ -168,20 +168,20 @@ 
 	*

 	*  @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( $this->error_log_file_path ) ) {

+			if( file_exists( $this->error_log_file_path ) ) {
 				$error_log_contents = file_get_contents( $this->error_log_file_path, true );							

-				if( $error_log_contents === FALSE ) {

+				if( $error_log_contents === FALSE ) {
 					return _e( 'File get contents not available' , 'yikes-inc-easy-mailchimp-extender' );

 				}

-				if ( $error_log_contents != '' ) {

+				if ( $error_log_contents != '' ) {
 					// return $error_log_contents;

 					print_r( $error_log_contents );

-				} else {

+				} else {
 					?>

 						<!-- table body -->

 						<tr class="error-log-tr">

@@ -195,7 +195,7 @@ 
 						</tr>

 					<?php

 				}

-			} else {

+			} else {
 				?>

 						<!-- table body -->

 						<tr class="error-log-tr">

@@ -223,7 +223,8 @@ 
 						</tr>

 					<?php

 			}

-		} else { // if file_get_contents is disabled server side

+		} else {
+// if file_get_contents is disabled server side

 			?>

 				<!-- table body -->

 				<tr>