yikesinc / yikes-inc-easy-mailchimp-extender

admin/partials/helpers/fields/yikes-mailchimp-checkbox-field.php

Spacing +8 added lines, -8 removed lines

@@ -5,16 +5,16 @@
 *	For help on using, see our documentation [https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/]
 * 	@since 6.0
 */
-	if ( is_string( $form_data['custom_fields'] ) ) {
-		$field_data = json_decode( $form_data['custom_fields'] , true );
-	} elseif ( is_array( $form_data['custom_fields'] ) ) {
-		$field_data = $form_data['custom_fields'];
+	if ( is_string( $form_data[ 'custom_fields' ] ) ) {
+		$field_data = json_decode( $form_data[ 'custom_fields' ], true );
+	} elseif ( is_array( $form_data[ 'custom_fields' ] ) ) {
+		$field_data = $form_data[ 'custom_fields' ];
 	}
 ?>
 <label class="custom-field-section">
-	<strong><?php echo $field['label']; ?></strong>
-	<input type="checkbox" class="widefat" name="custom-field[<?php echo $field['id']; ?>]" id="custom-field" value="1" <?php checked( isset( $field_data[$field['id']] ) ? $field_data[$field['id']] : 0, 1, true ); ?>>
-	<?php if( isset( $field['description'] ) && $field['description'] != '' ) { ?>
-	<p class="description"><?php echo $field['description']; ?></p>
+	<strong><?php echo $field[ 'label' ]; ?></strong>
+	<input type="checkbox" class="widefat" name="custom-field[<?php echo $field[ 'id' ]; ?>]" id="custom-field" value="1" <?php checked( isset( $field_data[ $field[ 'id' ] ] ) ? $field_data[ $field[ 'id' ] ] : 0, 1, true ); ?>>
+	<?php if ( isset( $field[ 'description' ] ) && $field[ 'description' ] != '' ) { ?>
+	<p class="description"><?php echo $field[ 'description' ]; ?></p>
 	<?php } ?>
 </label>

admin/partials/helpers/fields/yikes-mailchimp-file-field.php

Spacing +13 added lines, -13 removed lines

@@ -5,10 +5,10 @@ 
 	*	For help on using, see our documentation [https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/]
 	* 	@since 6.0
 	*/
-	if ( is_string( $form_data['custom_fields'] ) ) {
-		$field_data = json_decode( $form_data['custom_fields'] , true );
-	} elseif ( is_array( $form_data['custom_fields'] ) ) {
-		$field_data = $form_data['custom_fields'];
+	if ( is_string( $form_data[ 'custom_fields' ] ) ) {
+		$field_data = json_decode( $form_data[ 'custom_fields' ], true );
+	} elseif ( is_array( $form_data[ 'custom_fields' ] ) ) {
+		$field_data = $form_data[ 'custom_fields' ];
 	}
 	 
 	// This will enqueue the Media Uploader script
@@ -16,27 +16,27 @@ 
 	// And let's not forget the script we wrote earlier
 	wp_enqueue_script( 'yikes-mailchimp-file-field-script', plugin_dir_url( __FILE__ ) . 'js/yikes-mc-file-upload.js', array( 'jquery' ), '1.0', false );
 	// print_r( $field_data );
-	wp_localize_script( 'yikes-mailchimp-file-field-script' , 'additional_data' , array(
+	wp_localize_script( 'yikes-mailchimp-file-field-script', 'additional_data', array(
 		'wp_includes_image_url' => includes_url() . 'images/media/'
 	) );
 	$i = 1;
 	// create an single item array when nothing is stored yet, loop for one field 
-	$field_data['incentive-attachment'] = ( isset( $field_data['incentive-attachment'] ) && !empty( $field_data['incentive-attachment'] ) )  ? $field_data['incentive-attachment'] : array( '' );
+	$field_data[ 'incentive-attachment' ] = ( isset( $field_data[ 'incentive-attachment' ] ) && ! empty( $field_data[ 'incentive-attachment' ] ) ) ? $field_data[ 'incentive-attachment' ] : array( '' );
 ?>
 	
 	<div class="yikes-mailchimp-file-field">
-		<label for="image_url" class="widefat"><strong><?php echo $field['label']; ?></strong></label>
-		<?php foreach( $field_data['incentive-attachment'] as $attachment ) { ?>
-			<input type="text" name="custom-field[<?php echo $field['id']; ?>][<?php echo $i; ?>]" id="custom-field[<?php echo $field['id']; ?>][<?php echo $i; ?>]" class="file-attachment" value="<?php echo isset( $field_data[$field['id']][$i] ) ? $field_data[$field['id']][$i] : ''; ?>">
-			<input type="button" name="upload-btn" id="upload-btn" class="button-secondary" data-attr-position="<?php echo $i; ?>" value="<?php _e( 'Upload File' , 'yikes-inc-easy-mailchimp-extender' ); ?>">
+		<label for="image_url" class="widefat"><strong><?php echo $field[ 'label' ]; ?></strong></label>
+		<?php foreach ( $field_data[ 'incentive-attachment' ] as $attachment ) { ?>
+			<input type="text" name="custom-field[<?php echo $field[ 'id' ]; ?>][<?php echo $i; ?>]" id="custom-field[<?php echo $field[ 'id' ]; ?>][<?php echo $i; ?>]" class="file-attachment" value="<?php echo isset( $field_data[ $field[ 'id' ] ][ $i ] ) ? $field_data[ $field[ 'id' ] ][ $i ] : ''; ?>">
+			<input type="button" name="upload-btn" id="upload-btn" class="button-secondary" data-attr-position="<?php echo $i; ?>" value="<?php _e( 'Upload File', 'yikes-inc-easy-mailchimp-extender' ); ?>">
 			<div class="file-container">
 				<p class="file-remove-wrapper">
-					<a href="#" class="remove-file-button" data-attr-position="<?php echo $i; ?>"><?php _e( 'Remove File' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+					<a href="#" class="remove-file-button" data-attr-position="<?php echo $i; ?>"><?php _e( 'Remove File', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 				</p>
 			</div>
 		<?php $i++; } ?>
-		<?php if( isset( $field['repeat'] ) ) { ?>
+		<?php if ( isset( $field[ 'repeat' ] ) ) { ?>
 			<a href="#" class="button-secondary add-new-incentive-attachment" data-attr-position="<?php echo $i; ?>"><span class="dashicons dashicons-plus"></span></a>
 		<?php } ?>
-		<p class="description"><?php echo $field['description']; ?></p>
+		<p class="description"><?php echo $field[ 'description' ]; ?></p>
 	</div>
\ No newline at end of file

admin/partials/helpers/fields/yikes-mailchimp-wysiwyg-field.php

Spacing +9 added lines, -9 removed lines

@@ -6,18 +6,18 @@
 	*	For help on using, see our documentation [https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/]
 	* 	@since 6.0
 	*/
-	if ( is_string( $form_data['custom_fields'] ) ) {
-		$field_data = json_decode( $form_data['custom_fields'] , true );
-	} elseif ( is_array( $form_data['custom_fields'] ) ) {
-		$field_data = $form_data['custom_fields'];
+	if ( is_string( $form_data[ 'custom_fields' ] ) ) {
+		$field_data = json_decode( $form_data[ 'custom_fields' ], true );
+	} elseif ( is_array( $form_data[ 'custom_fields' ] ) ) {
+		$field_data = $form_data[ 'custom_fields' ];
 	}
 	
-	$content = ( isset( $field_data[$field['id']] ) ) ? $field_data[$field['id']] : ( isset( $field['default'] ) ? $field['default'] : '' );
-	$wysiwyg_id = 'custom-field['.$field['id'].']';
+	$content = ( isset( $field_data[ $field[ 'id' ] ] ) ) ? $field_data[ $field[ 'id' ] ] : ( isset( $field[ 'default' ] ) ? $field[ 'default' ] : '' );
+	$wysiwyg_id = 'custom-field[' . $field[ 'id' ] . ']';
 ?>
 
 <div class="yikes-mailchimp-wysiwyg-field">
-    <label for="image_url" class="widefat"><strong><?php echo $field['label']; ?></strong></label>
-    <?php wp_editor( $content, $field['id'], array( 'textarea_name' => $wysiwyg_id ) ); ?>
-    <p class="description"><?php echo $field['description']; ?></p>
+    <label for="image_url" class="widefat"><strong><?php echo $field[ 'label' ]; ?></strong></label>
+    <?php wp_editor( $content, $field[ 'id' ], array( 'textarea_name' => $wysiwyg_id ) ); ?>
+    <p class="description"><?php echo $field[ 'description' ]; ?></p>
 </div>

admin/partials/helpers/fields/yikes-mailchimp-radio-field.php

Spacing +9 added lines, -9 removed lines

@@ -5,26 +5,26 @@
 	*	For help on using, see our documentation [https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/]
 	* 	@since 6.0
 	*/
-	if ( is_string( $form_data['custom_fields'] ) ) {
-		$field_data = json_decode( $form_data['custom_fields'] , true );
-	} elseif ( is_array( $form_data['custom_fields'] ) ) {
-		$field_data = $form_data['custom_fields'];
+	if ( is_string( $form_data[ 'custom_fields' ] ) ) {
+		$field_data = json_decode( $form_data[ 'custom_fields' ], true );
+	} elseif ( is_array( $form_data[ 'custom_fields' ] ) ) {
+		$field_data = $form_data[ 'custom_fields' ];
 	}
 ?>
 <div class="custom-field-section">
 	<!-- title -->
-	<strong><?php echo $field['label']; ?></strong>
+	<strong><?php echo $field[ 'label' ]; ?></strong>
 	<!-- radio buttons -->
 	<section class="custom-radio-holder">
-		<?php foreach( $field['options'] as $value => $label ) { ?>
+		<?php foreach ( $field[ 'options' ] as $value => $label ) { ?>
 			<label class="custom-radio-label">
-				<input type="radio" name="custom-field[<?php echo $field['id']; ?>][]" id="custom-field" value="<?php echo $value; ?>" <?php if( isset( $field_data[$field['id']] ) ) { checked( $field_data[$field['id']] , $value ); } ?>>
+				<input type="radio" name="custom-field[<?php echo $field[ 'id' ]; ?>][]" id="custom-field" value="<?php echo $value; ?>" <?php if ( isset( $field_data[ $field[ 'id' ] ] ) ) { checked( $field_data[ $field[ 'id' ] ], $value ); } ?>>
 				<?php echo $label; ?>
 			</label>
 		<?php } ?>
 	</section>
 	<!-- description -->
-	<?php if( isset( $field['description'] ) && $field['description'] != '' ) { ?>
-		<p class="description"><?php echo $field['description']; ?></p>
+	<?php if ( isset( $field[ 'description' ] ) && $field[ 'description' ] != '' ) { ?>
+		<p class="description"><?php echo $field[ 'description' ]; ?></p>
 	<?php } ?>
 </div>
\ No newline at end of file

public/partials/shortcodes/yikes-mailchimp-subscriber-count.php

Spacing +4 added lines, -4 removed lines

@@ -26,8 +26,8 @@ 
 		return '';
 	}
 
-	$form    = ( ! empty( $attributes['form'] ) ) ? str_replace( '"', '', $attributes['form'] ) : false;
-	$list_id = ( ! empty( $attributes['list'] ) ) ? $attributes['list'] : false;
+	$form    = ( ! empty( $attributes[ 'form' ] ) ) ? str_replace( '"', '', $attributes[ 'form' ] ) : false;
+	$list_id = ( ! empty( $attributes[ 'list' ] ) ) ? $attributes[ 'list' ] : false;
 
 	/* If no list ID was passed into the shortcode - bail */
 	if ( ! $list_id && ! $form ) {
@@ -52,7 +52,7 @@ 
 			return '';
 		}
 
-		$list_id = sanitize_key( $form_data['list_id'] ); // associated list id (users who fill out the form will be subscribed to this list)
+		$list_id = sanitize_key( $form_data[ 'list_id' ] ); // associated list id (users who fill out the form will be subscribed to this list)
 	}
 
 	// object buffer
@@ -71,7 +71,7 @@ 
 	}
 
 	/* type cast the returned value as an integer */
-	echo (int) apply_filters( 'yikes-mailchimp-subscriber-count-value', $list_data['stats']['member_count'] );
+	echo (int) apply_filters( 'yikes-mailchimp-subscriber-count-value', $list_data[ 'stats' ][ 'member_count' ] );
 
 	return ob_get_clean();
 

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