yikesinc / yikes-inc-easy-mailchimp-extender

admin/partials/helpers/edit-form-hidden-section-template.php

Braces +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 											<?php
 										}
 										$main_field_data = $section_data['main_fields'];
-										foreach( $main_field_data as $field ) { 
+										foreach( $main_field_data as $field ) {
 											if( $field['type'] == 'custom' ) {
 												// execute the custom callback
 												$field['callback']();
@@ -53,7 +53,7 @@ 
 												<?php
 											}
 											$sidebar_field_data = $section_data['sidebar_fields'];
-											foreach( $sidebar_field_data as $field ) { 
+											foreach( $sidebar_field_data as $field ) {
 												if( $field['type'] == 'custom' ) {
 													// execute the custom callback
 													$field['callback']();

includes/import-export/yikes-easy-mailchimp-import.class.php

Braces +2 added lines, -1 removed lines

@@ -54,7 +54,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
 				// If this is the first row, then it should be title data.
 				if ( 1 === $row ) {
 					$titles = $line;

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

Braces +8 added lines, -8 removed lines

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

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

  */

-class Yikes_Inc_Easy_Mailchimp_Extender_Loader {

+class Yikes_Inc_Easy_Mailchimp_Extender_Loader {
 	/**

 	 * The array of actions registered with WordPress.

 	 *

@@ -41,7 +41,7 @@ 
 	 *

 	 * @since    6.0.0

 	 */

-	public function __construct() {

+	public function __construct() {
 		$this->actions = array();

 		$this->filters = array();

 	}

@@ -55,7 +55,7 @@ 
 	 * @param      int      Optional    $priority         The priority at which the function should be fired.

 	 * @param      int      Optional    $accepted_args    The number of arguments that should be passed to the $callback.

 	 */

-	public function add_action( $hook, $component, $callback, $priority = 10, $accepted_args = 1 ) {

+	public function add_action( $hook, $component, $callback, $priority = 10, $accepted_args = 1 ) {
 		$this->actions = $this->add( $this->actions, $hook, $component, $callback, $priority, $accepted_args );

 	}

 	/**

@@ -68,7 +68,7 @@ 
 	 * @param      int      Optional    $priority         The priority at which the function should be fired.

 	 * @param      int      Optional    $accepted_args    The number of arguments that should be passed to the $callback.

 	 */

-	public function add_filter( $hook, $component, $callback, $priority = 10, $accepted_args = 1 ) {

+	public function add_filter( $hook, $component, $callback, $priority = 10, $accepted_args = 1 ) {
 		$this->filters = $this->add( $this->filters, $hook, $component, $callback, $priority, $accepted_args );

 	}

 	/**

@@ -85,7 +85,7 @@ 
 	 * @param      int      Optional    $accepted_args    The number of arguments that should be passed to the $callback.

 	 * @return   type                                   The collection of actions and filters registered with WordPress.

 	 */

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

+	private function add( $hooks, $hook, $component, $callback, $priority, $accepted_args ) {
 		$hooks[] = array(

 			'hook'          => $hook,

 			'component'     => $component,

@@ -100,11 +100,11 @@ 
 	 *

 	 * @since    6.0.0

 	 */

-	public function run() {

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

+	public function run() {
+		foreach ( $this->filters as $hook ) {
 			add_filter( $hook['hook'], array( $hook['component'], $hook['callback'] ), $hook['priority'], $hook['accepted_args'] );

 		}

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

+		foreach ( $this->actions as $hook ) {
 			add_action( $hook['hook'], array( $hook['component'], $hook['callback'] ), $hook['priority'], $hook['accepted_args'] );

 		}

 	}

public/classes/process/class.process_form_submission_handler.php

Doc Comments +3 added lines

@@ -1051,6 +1051,7 @@ 
 	* @param string | $slug 		| The type of message we're looking for
 	* @param string | $response_text| The default response message
 	* @param array  | $data			| An array of data that may be needed to construct the user's error message
+	* @param string $slug
 	* @return string| $response_text| The $response_text (after it's potentially been changed)
 	*/
 	protected function check_for_user_defined_response_message( $slug, $response_text, $data = false ) {
@@ -1198,6 +1199,7 @@ 
 	*
 	* @param string | $message		| The response message
 	* @param bool	| $is_success	| Boolean signifying if we're returning a success message or an error message
+	* @param boolean $is_success
 	* @return string| The $message wrapping in HTML
 	*/
 	public function wrap_form_submission_response( $message, $is_success ) {
@@ -1242,6 +1244,7 @@ 
 	* @param string | $response					| The response message to display to the user
 	* @param array  | $additional_fields		| An array of additional fields to return
 	* @param bool	| $return_response_non_ajax | Boolean deciding if we need to return a message
+	* @param integer $hide
 	*
 	* @return If AJAX, return $this->yikes_send_json_error(). If not AJAX, return an array || false.
 	*/	

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

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

public/partials/shortcodes/process_form_shortcode.php

Braces +6 added lines, -4 removed lines

@@ -474,7 +474,9 @@ 
 						$field_array['required'] = isset( $field['require'] ) ? 'required="required"' : '';
 						$label_array['visible'] = isset( $field['hide'] ) ? 'style="display:none;"' : '';
 						$label_class_array[] = ( $tag === 'merge' ) ? $field['merge'] . '-label' : $field['group_id'] . '-label';
-						if ( isset( $field['require'] ) ) $label_class_array[] = 'yikes-mailchimp-field-required';
+						if ( isset( $field['require'] ) ) {
+							$label_class_array[] = 'yikes-mailchimp-field-required';
+						}
 					}
 
 					// if both hide label and hide field are checked, we gotta hide the field!
@@ -761,7 +763,7 @@ 
 														} else {
 															$zip_value = $_POST[$field['merge']]; 
 														}
-													} else { 
+													} else {
 
 														/**
 														* A filter to set the default zip code value.
@@ -1125,7 +1127,7 @@ 
 												echo $no_default === true ? '<option value="">' . $no_default_name . '</option>' : '';
 
 												$i = 0;
-												foreach( $groups as $group_id => $name ) { 
+												foreach( $groups as $group_id => $name ) {
 
 													// If the form was submitted and failed, set the submitted/chosen values as the default
 													if( isset( $_POST[ 'group-' . $field['group_id'] ] ) && $form_submitted === 0 ) {
@@ -1174,7 +1176,7 @@ 
 										// Turn $default_choice into an array if it isn't already
 										$default_choice = ( isset( $default_choice ) && is_array( $default_choice ) ) ? $default_choice : array( $default_choice );
 
-										foreach( $groups as $group_id => $name ) { 
+										foreach( $groups as $group_id => $name ) {
 											?>
 											<label for="<?php echo esc_attr( $field['group_id'] ) . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ' , $custom_classes ); if ( $x === $count ) { echo ' last-selection'; } ?>" style="display:none;">
 												<input 

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

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>

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

Braces +14 added lines, -14 removed lines

@@ -53,23 +53,23 @@ 
 	);

 

 	// Easy Digital Downloads.

-	if ( class_exists( 'Easy_Digital_Downloads' ) ) {

+	if ( class_exists( 'Easy_Digital_Downloads' ) ) {
 		$active_plugins['easy_digital_downloads_checkout_form'] = __( 'Easy Digital Downloads Checkout', 'yikes-inc-easy-mailchimp-extender' );

 	}

 	// WooCommerce.

-	if ( class_exists( 'WooCommerce' ) ) {

+	if ( class_exists( 'WooCommerce' ) ) {
 		$active_plugins['woocommerce_checkout_form'] = __( 'WooCommerce Checkout', 'yikes-inc-easy-mailchimp-extender' );

 	}

 	// BuddyPress.

-	if ( class_exists( 'BuddyPress' ) ) {

+	if ( class_exists( 'BuddyPress' ) ) {
 		$active_plugins['buddypress_form'] = __( 'BuddyPress Registration', 'yikes-inc-easy-mailchimp-extender' );

 	}

 	// bbPress.

-	if ( class_exists( 'bbPress' ) ) {

+	if ( class_exists( 'bbPress' ) ) {
 		$active_plugins['bbpress_forms'] = __( 'bbPress', 'yikes-inc-easy-mailchimp-extender' );

 	}

 	// Contact Form 7.

-	if ( is_plugin_active( 'contact-form-7/wp-contact-form-7.php' ) ) {

+	if ( is_plugin_active( 'contact-form-7/wp-contact-form-7.php' ) ) {
 		$active_plugins['contact_form_7'] = __( 'Contact Form 7', 'yikes-inc-easy-mailchimp-extender' );

 	}

 

@@ -81,9 +81,9 @@ 
 

 	<?php

 	// lets confirm the user has a valid API key stored.

-	if ( $this->is_user_mc_api_valid_form( false ) == 'valid' ) {

+	if ( $this->is_user_mc_api_valid_form( false ) == 'valid' ) {
 		$list_data = yikes_get_mc_api_manager()->get_list_handler()->get_lists();

-		if ( is_wp_error( $list_data ) ) {

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

 			$error_logging->maybe_write_to_log(

 				$list_data->get_error_code(),

@@ -91,7 +91,7 @@ 
 				"Integration Settings Page"

 			);

 		}

-	} else {

+	} else {
 		?>

 		<div class="inside">

 			<?php

@@ -116,9 +116,9 @@ 
 

 	<ul>

 		<?php

-			if ( ! empty( $active_plugins ) ) {

+			if ( ! empty( $active_plugins ) ) {
 

-				foreach( $active_plugins as $class => $value ) {

+				foreach( $active_plugins as $class => $value ) {
 

 					$checked              = isset( $options[$class]['value'] ) ? 'checked="checked"' : '';

 					$hidden               = ! isset( $options[$class]['value'] ) ? 'yikes-easy-mc-hidden' : '';

@@ -145,7 +145,7 @@ 
 								<!-- Associated Lists -->

 								<div class="checkbox-lists"><strong><?php _e( 'Choose Lists: ', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>

 									<?php

-									if ( count( $list_data ) > 0 ) {

+									if ( count( $list_data ) > 0 ) {
 									?>

 										<?php foreach( $list_data as $list ) { ?>

 

@@ -163,14 +163,14 @@ 
 

 											<!-- If interest groups have been selected already, load them here -->

 											<?php

-											if ( in_array( $list['id'], $selected_list ) && $list_interest_groups ) {

+											if ( in_array( $list['id'], $selected_list ) && $list_interest_groups ) {
 												YIKES_Inc_Easy_Mailchimp_Process_Ajax::check_list_for_interest_groups( $list['id'], $class, true );

 											}

 											?>

 

 										<?php } ?>

 									<?php

-								} else {

+								} else {
 									echo '<p class="description no-lists-setup-notice"><strong>' . __( 'You have not setup any lists. Head over to Mailchimp and setup your first list.', 'yikes-inc-easy-mailchimp-extender' ) . '</strong></p>';

 								}

 								?>

@@ -193,7 +193,7 @@ 
 						</li>

 					<?php

 			}

-		} else {

+		} else {
 			?>

 				<li>

 					<?php _e( 'Nothing is active.', 'yikes-inc-easy-mailchimp-extender' ); ?>

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

Braces +10 added lines, -9 removed lines

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

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

  */

-class Yikes_Inc_Easy_Mailchimp_Extender_Activator {

+class Yikes_Inc_Easy_Mailchimp_Extender_Activator {
 	/**

 	 * Short Description. Activation hook.

 	 *

@@ -26,16 +26,16 @@ 
 	 *

 	 * @since    6.0.0

 	 */

-	public static function activate( $network_wide ) {

+	public static function activate( $network_wide ) {
 		global $wpdb;

 

-		if ( function_exists( 'is_multisite' ) && is_multisite() ) {

+		if ( function_exists( 'is_multisite' ) && is_multisite() ) {
 			// check if it is a network activation - if so, run the activation function for each blog id

-			if ( $network_wide ) {

+			if ( $network_wide ) {
 				$old_blog = $wpdb->blogid;

 				// Get all blog ids

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

-				foreach ( $blogids as $blog_id ) {

+				foreach ( $blogids as $blog_id ) {
 					switch_to_blog( $blog_id );

 					self::_activate_yikes_easy_mailchimp( $wpdb );

 					restore_current_blog();

@@ -44,7 +44,8 @@ 
 				return;

 			}

 			self::_activate_yikes_easy_mailchimp( $wpdb );

-		} else { /* end network activate */

+		} else {
+/* end network activate */

 			self::_activate_yikes_easy_mailchimp( $wpdb );

 		}

 	}

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

 	 * @since    6.0.0

 	 */

-	static function _activate_yikes_easy_mailchimp( $wpdb ) {

+	static function _activate_yikes_easy_mailchimp( $wpdb ) {
 

 		// single site

 		$custom_table_name = $wpdb->prefix . 'yikes_easy_mc_forms';

@@ -95,12 +96,12 @@ 
 

 		// 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' ) == '' ) {

+		if ( ! get_option( 'yikes_easy_mailchimp_activation_date' ) || get_option( 'yikes_easy_mailchimp_activation_date' ) == '' ) {
 			update_option( 'yikes_easy_mailchimp_activation_date', strtotime( 'now' ) );

 		}

 

 		// Create an option for the forms.

-		if ( class_exists( 'Yikes_Inc_Easy_Mailchimp_Extender_Option_Forms' ) ) {

+		if ( class_exists( 'Yikes_Inc_Easy_Mailchimp_Extender_Option_Forms' ) ) {
 			$option_class = new Yikes_Inc_Easy_Mailchimp_Extender_Option_Forms();

 			$option_class->create_option();

 		}