yikesinc / yikes-inc-easy-mailchimp-extender

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

admin/partials/view-list.php

Indentation +3 added lines, -3 removed lines

@@ -302,9 +302,9 @@
 									?></ul><?php
 								}
 								/**
-								*	Custom action hook for our add-ons to hook into
-								*	@since 6.0.3.8
-								*/
+								 *	Custom action hook for our add-ons to hook into
+								 *	@since 6.0.3.8
+								 */
 								do_action( 'yikes-mailchimp-list-form-fields-metabox' );
 							?>
 

Spacing +71 added lines, -71 removed lines

@@ -1,9 +1,9 @@ 
 <?php
-if ( ! isset( $_REQUEST['list-id'] ) ) {
+if ( ! isset( $_REQUEST[ 'list-id' ] ) ) {
 	wp_die( __( 'Oops, we can\'t determine what List to view. Please go back and try again.' ) );
 }
 
-$list_id       = sanitize_key( $_REQUEST['list-id'] );
+$list_id       = sanitize_key( $_REQUEST[ 'list-id' ] );
 $list_helper   = yikes_get_mc_api_manager()->get_list_handler();
 $api_key       = yikes_get_mc_api_key();
 $dash_position = strpos( $api_key, '-' );
@@ -60,10 +60,10 @@ 
 }
 
 // setup pagination variables
-$paged			= isset( $_REQUEST['paged'] ) ? filter_var( $_REQUEST['paged'], FILTER_SANITIZE_NUMBER_INT ) : 0;
+$paged			= isset( $_REQUEST[ 'paged' ] ) ? filter_var( $_REQUEST[ 'paged' ], FILTER_SANITIZE_NUMBER_INT ) : 0;
 $limit			= apply_filters( 'yikes_admin_list_subscriber_limit', 20 );
-$page_offset	= (int) $paged * (int) $limit;
-$sort_dir		= isset( $_REQUEST['sort'] ) ? $_REQUEST['sort'] : 'DESC';
+$page_offset = (int) $paged * (int) $limit;
+$sort_dir = isset( $_REQUEST[ 'sort' ] ) ? $_REQUEST[ 'sort' ] : 'DESC';
 
 if ( $sort_dir === 'DESC' ) {
 	$opposite_sort_dir = 'ASC';
@@ -90,25 +90,25 @@ 
 ?>
 <div class="wrap">
 	<!-- Freddie Logo -->
-	<img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png'; ?>" alt="<?php __( 'Freddie - MailChimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
+	<img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png'; ?>" alt="<?php __( 'Freddie - MailChimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
 
-	<h1>YIKES Easy Forms for MailChimp | <?php echo $list_data['name']; ?></h1>
+	<h1>YIKES Easy Forms for MailChimp | <?php echo $list_data[ 'name' ]; ?></h1>
 
 	<!-- Settings Page Description -->
-	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'View all subscribers below. View additional subscriber info, or add additional fields to this list.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
-	<!-- <p class="add-new-subscriber-button"><a href="#" onclick="jQuery(this).parent().next().slideToggle();" class="add-new-h2"><?php _e( 'New Subscriber' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></p> -->
+	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'View all subscribers below. View additional subscriber info, or add additional fields to this list.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+	<!-- <p class="add-new-subscriber-button"><a href="#" onclick="jQuery(this).parent().next().slideToggle();" class="add-new-h2"><?php _e( 'New Subscriber', 'yikes-inc-easy-mailchimp-extender' ); ?></a></p> -->
 
 	<?php
 		/* Display our admin notices here */
 		// Unsubscribe user confirmation message
-		if( isset( $_REQUEST['user-unsubscribed'] ) && $_REQUEST['user-unsubscribed'] == 'true' ) {
+		if ( isset( $_REQUEST[ 'user-unsubscribed' ] ) && $_REQUEST[ 'user-unsubscribed' ] == 'true' ) {
 			?>
 			<div class="updated manage-form-admin-notice">
 				<p><?php _e( 'User successfully unsubscribed.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 			</div>
 			<?php
 		}
-		if( isset( $_REQUEST['user-unsubscribed'] ) && $_REQUEST['user-unsubscribed'] == 'false' ) {
+		if ( isset( $_REQUEST[ 'user-unsubscribed' ] ) && $_REQUEST[ 'user-unsubscribed' ] == 'false' ) {
 			?>
 			<div class="error manage-form-admin-notice">
 				<p><?php _e( "We've encountered an error trying to remove the subscriber. Please try again. If the error persists please get in contact with the YIKES Inc. support staff.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -118,9 +118,9 @@ 
 	?>
 
 	<section class="add-new-subscriber-form-container">
-		<h4><?php _e( 'Add New Subscriber' , 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
+		<h4><?php _e( 'Add New Subscriber', 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
 		<form id="add-new-subcscriber">
-			<input type="text" class="regular-text" placeholder="<?php _e( 'User Email Address' , 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
+			<input type="text" class="regular-text" placeholder="<?php _e( 'User Email Address', 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
 			<p><?php submit_button( 'Add Subscriber' ); ?></p>
 		</form>
 	</section>
@@ -142,8 +142,8 @@ 
 									<!-- TABLE HEAD -->
 									<thead>
 										<tr>
-											<th id="user-email columnname" class="manage-column column-columnname" scope="col"><a id="user-email-sort" href="<?php echo esc_url_raw( add_query_arg( array( 'column' => 'email' , 'sort' => $opposite_sort_dir ) ) ); ?>"><?php _e( 'User Email' , 'yikes-inc-easy-mailchimp-extender' ); echo $icon;?></a></th>
-											<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Email Client' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+											<th id="user-email columnname" class="manage-column column-columnname" scope="col"><a id="user-email-sort" href="<?php echo esc_url_raw( add_query_arg( array( 'column' => 'email', 'sort' => $opposite_sort_dir ) ) ); ?>"><?php _e( 'User Email', 'yikes-inc-easy-mailchimp-extender' ); echo $icon; ?></a></th>
+											<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Email Client', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
 										</tr>
 									</thead>
 									<!-- end header -->
@@ -151,8 +151,8 @@ 
 									<!-- FOOTER -->
 									<tfoot>
 										<tr>
-											<th class="manage-column column-columnname" scope="col"><?php _e( 'User Email' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-											<th class="manage-column column-columnname num" scope="col"><?php _e( 'Email Client' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+											<th class="manage-column column-columnname" scope="col"><?php _e( 'User Email', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+											<th class="manage-column column-columnname num" scope="col"><?php _e( 'Email Client', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
 										</tr>
 									</tfoot>
 									<!-- end footer -->
@@ -162,15 +162,15 @@ 
 										<?php if ( count( $subscribers_list ) > 0 ) {
 											$i = 1;
 											foreach ( $subscribers_list as $subscriber ) {
-												$user_id           = $subscriber['id'];
+												$user_id           = $subscriber[ 'id' ];
 												$path              = YIKES_MC_URL . "includes/images/na.png";
 												$email_client_icon = "<img width='35' src='" . $path . "' alt='" . __( 'not set', 'yikes-inc-easy-mailchimp-extender' ) . "' title='" . __( 'not set', 'yikes-inc-easy-mailchimp-extender' ) . "'>";
 
 												?>
 												<tr class="<?php if ( $i % 2 == 0 ) { echo 'alternate'; } ?>">
 													<td class="column-columnname">
-														<a class="user-email row-title" href="mailto:<?php echo sanitize_email( $subscriber['email_address'] ); ?>">
-															<?php echo sanitize_email( $subscriber['email_address'] ); ?>
+														<a class="user-email row-title" href="mailto:<?php echo sanitize_email( $subscriber[ 'email_address' ] ); ?>">
+															<?php echo sanitize_email( $subscriber[ 'email_address' ] ); ?>
 														</a>
 														<div class="row-actions">
 															<?php $view_user_info_url = esc_url_raw( add_query_arg( array(
@@ -184,17 +184,17 @@ 
 																'nonce'          => wp_create_nonce( 'unsubscribe-user-' . $user_id ),
 																'email_id'       => $user_id,
 															) ) ); ?>
-															<span><a href="<?php echo $url; ?>" onclick="return confirm('<?php printf( __( "Are you sure you want to unsubscribe %s from this mailing list?", 'yikes-inc-easy-mailchimp-extender' ), sanitize_email( $subscriber['email_address'] ) ); ?>');" class="yikes-delete-subscriber"><?php _e( "Unsubscribe", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+															<span><a href="<?php echo $url; ?>" onclick="return confirm('<?php printf( __( "Are you sure you want to unsubscribe %s from this mailing list?", 'yikes-inc-easy-mailchimp-extender' ), sanitize_email( $subscriber[ 'email_address' ] ) ); ?>');" class="yikes-delete-subscriber"><?php _e( "Unsubscribe", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 														</div>
 													</td>
 													<td class="column-columnname num"><?php echo $email_client_icon; ?></td>
 												</tr>
 												<?php
-												$i ++;
+												$i++;
 											}
 											} else { ?>
 											<tr class="no-items">
-												<td class="colspanchange no-current-subscriber-notice" colspan="2"><em><?php _e( 'No one is currently subscribed to this list.' , 'yikes-inc-easy-mailchimp-extender' ); ?></em></td>
+												<td class="colspanchange no-current-subscriber-notice" colspan="2"><em><?php _e( 'No one is currently subscribed to this list.', 'yikes-inc-easy-mailchimp-extender' ); ?></em></td>
 											</tr>
 										<?php } ?>
 									</tbody>
@@ -206,11 +206,11 @@ 
 						<!-- pagination -->
 						<div class="tablenav">
 							<div class="tablenav-pages">
-								<a class='first-page <?php if( $paged == 0 ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the first page" , 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => 0 ) ) ); ?>'>&laquo;</a>
-								<a class='prev-page <?php if( $paged == 0 ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the previous page" , 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => intval( $paged - 1 ) ) ) ); ?>'>&lsaquo;</a>
-								<span class="paging-input"><input class='current-page' title='<?php _e( "Current page" , 'yikes-inc-easy-mailchimp-extender' ); ?>' type='text' name='paged' value='<?php if( $paged == 0 ) { echo '1'; } else { echo intval( $paged + 1 ); } ?>' size='1' /> <?php _e( 'of', 'yikes-inc-easy-mailchimp-extender' ); ?> <span class='total-pages'><?php echo $total_pages; ?></span></span>
-								<a class='next-page <?php if( $paged == intval( $total_pages - 1 ) ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the next page" , 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => intval( $paged + 1 ) ) ) ); ?>'>&rsaquo;</a>
-								<a class='last-page <?php if( $paged == intval( $total_pages - 1 ) ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the last page" , 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => intval( $total_pages - 1 ) ) ) ); ?>'>&raquo;</a>
+								<a class='first-page <?php if ( $paged == 0 ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the first page", 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => 0 ) ) ); ?>'>&laquo;</a>
+								<a class='prev-page <?php if ( $paged == 0 ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the previous page", 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => intval( $paged - 1 ) ) ) ); ?>'>&lsaquo;</a>
+								<span class="paging-input"><input class='current-page' title='<?php _e( "Current page", 'yikes-inc-easy-mailchimp-extender' ); ?>' type='text' name='paged' value='<?php if ( $paged == 0 ) { echo '1'; } else { echo intval( $paged + 1 ); } ?>' size='1' /> <?php _e( 'of', 'yikes-inc-easy-mailchimp-extender' ); ?> <span class='total-pages'><?php echo $total_pages; ?></span></span>
+								<a class='next-page <?php if ( $paged == intval( $total_pages - 1 ) ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the next page", 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => intval( $paged + 1 ) ) ) ); ?>'>&rsaquo;</a>
+								<a class='last-page <?php if ( $paged == intval( $total_pages - 1 ) ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the last page", 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => intval( $total_pages - 1 ) ) ) ); ?>'>&raquo;</a>
 							</div>
 						</div>
 
@@ -225,21 +225,21 @@ 
 
 						<div class="postbox yikes-easy-mc-postbox">
 
-							<h3><?php _e( 'List Overview' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
+							<h3><?php _e( 'List Overview', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
 
 							<?php
 								// store list rating
-								$list_rating = $list_data['list_rating'];
-								if( $list_rating > 0 ) {
-									$list_rating_explosion = explode( '.' , $list_rating );
+								$list_rating = $list_data[ 'list_rating' ];
+								if ( $list_rating > 0 ) {
+									$list_rating_explosion = explode( '.', $list_rating );
 									$star_array = array();
 									$x = 1;
-									while( $list_rating_explosion[0] >= $x ) {
-										$star_array[] = '<span class="dashicons dashicons-star-filled list-rating-star"></span>';
+									while ( $list_rating_explosion[ 0 ] >= $x ) {
+										$star_array[ ] = '<span class="dashicons dashicons-star-filled list-rating-star"></span>';
 										$x++;
 									}
-									if( $list_rating_explosion[1] == '5' ) {
-										$star_array[] = '<span class="dashicons dashicons-star-half list-rating-star"></span>';
+									if ( $list_rating_explosion[ 1 ] == '5' ) {
+										$star_array[ ] = '<span class="dashicons dashicons-star-half list-rating-star"></span>';
 									}
 								} else {
 									$star_array = array( 'n/a' );
@@ -247,40 +247,40 @@ 
 							?>
 							<table class="form-table">
 								<tr valign="top">
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'List Rating' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
-									<td><?php echo implode( ' ' , $star_array ); ?></td>
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'List Rating', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
+									<td><?php echo implode( ' ', $star_array ); ?></td>
 								</tr>
 								<tr valign="top">
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Average Subscribers' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
-									<td><?php echo $list_data['stats']['avg_sub_rate']; ?><small> / <?php  _e( 'month' , 'yikes-inc-easy-mailchimp-extender' ); ?></small></td>
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Average Subscribers', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
+									<td><?php echo $list_data[ 'stats' ][ 'avg_sub_rate' ]; ?><small> / <?php  _e( 'month', 'yikes-inc-easy-mailchimp-extender' ); ?></small></td>
 								</tr>
 								<tr valign="top">
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Subscriber Count' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
-									<td><?php echo intval( $list_data['stats']['member_count'] ); ?></td>
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Subscriber Count', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
+									<td><?php echo intval( $list_data[ 'stats' ][ 'member_count' ] ); ?></td>
 								</tr>
 								<tr valign="top">
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'New Since Last Campaign' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
-									<td><?php echo intval( $list_data['stats']['member_count_since_send'] ); ?></td>
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'New Since Last Campaign', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
+									<td><?php echo intval( $list_data[ 'stats' ][ 'member_count_since_send' ] ); ?></td>
 								</tr>
 								<tr valign="top">
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Created' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
-									<td><?php echo date( get_option('date_format') , strtotime( $list_data['date_created'] ) ); ?></td>
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Created', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
+									<td><?php echo date( get_option( 'date_format' ), strtotime( $list_data[ 'date_created' ] ) ); ?></td>
 								</tr>
 								<tr valign="top">
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'List Fields' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
-									<td><?php echo intval( $list_data['stats']['merge_field_count'] + 1 ); // add 1 for our email field.. ?></td>
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'List Fields', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
+									<td><?php echo intval( $list_data[ 'stats' ][ 'merge_field_count' ] + 1 ); // add 1 for our email field.. ?></td>
 								</tr>
 								<tr valign="top">
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Short Signup URL' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
-									<td><input type="text" class="widefat view-list-sidebar-input" value="<?php echo esc_url_raw( $list_data['subscribe_url_short'] ); ?>" readonly onclick="jQuery(this).select();"></td>
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Short Signup URL', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
+									<td><input type="text" class="widefat view-list-sidebar-input" value="<?php echo esc_url_raw( $list_data[ 'subscribe_url_short' ] ); ?>" readonly onclick="jQuery(this).select();"></td>
 								</tr>
 								<tr valign="top">
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Default From Email' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
-									<td><input type="text" class="widefat view-list-sidebar-input" value="<?php echo sanitize_email( $list_data['campaign_defaults']['from_email'] ); ?>" readonly onclick="jQuery(this).select();"></td>
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Default From Email', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
+									<td><input type="text" class="widefat view-list-sidebar-input" value="<?php echo sanitize_email( $list_data[ 'campaign_defaults' ][ 'from_email' ] ); ?>" readonly onclick="jQuery(this).select();"></td>
 								</tr>
 								<tr valign="top">
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Default From Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
-									<td><?php echo $list_data['campaign_defaults']['from_name']; ?></td>
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Default From Name', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
+									<td><?php echo $list_data[ 'campaign_defaults' ][ 'from_name' ]; ?></td>
 								</tr>
 							</table>
 
@@ -290,14 +290,14 @@ 
 						<!-- Merge Field Info -->
 						<div class="postbox yikes-easy-mc-postbox">
 
-							<h3><?php _e( 'Form Fields' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
+							<h3><?php _e( 'Form Fields', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
 							<?php
-								if( count( $merge_fields['merge_fields'] ) >= 1 ) {
+								if ( count( $merge_fields[ 'merge_fields' ] ) >= 1 ) {
 									?><ul class="merge-variable-ul"><?php
-										echo '<li class="interest-group-count">' . sprintf( _n( '%d Field', '%d Fields', intval( count( $merge_fields['merge_fields'] ) ), 'yikes-inc-easy-mailchimp-extender' ), intval( count( $merge_fields['merge_fields'] ) ) ) . '</li>';
-										foreach( $merge_fields['merge_fields'] as $merge_field ) {
+										echo '<li class="interest-group-count">' . sprintf( _n( '%d Field', '%d Fields', intval( count( $merge_fields[ 'merge_fields' ] ) ), 'yikes-inc-easy-mailchimp-extender' ), intval( count( $merge_fields[ 'merge_fields' ] ) ) ) . '</li>';
+										foreach ( $merge_fields[ 'merge_fields' ] as $merge_field ) {
 											// new action hook @since 6.0.3.8
-											echo '<li class="' . $merge_field['tag'] . '"><span class="dashicons dashicons-marker"></span>' . $merge_field['name'] . ' ' . do_action( 'yikes-mailchimp-list-field', $merge_field ) . '</li>';
+											echo '<li class="' . $merge_field[ 'tag' ] . '"><span class="dashicons dashicons-marker"></span>' . $merge_field[ 'name' ] . ' ' . do_action( 'yikes-mailchimp-list-field', $merge_field ) . '</li>';
 										}
 									?></ul><?php
 								}
@@ -314,7 +314,7 @@ 
 						<div class="postbox yikes-easy-mc-postbox">
 
 
-							<h3><?php _e( 'Interest Groups Overview' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
+							<h3><?php _e( 'Interest Groups Overview', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
 							<?php
 							if ( ! empty( $interest_groupings ) ) {
 								?>
@@ -322,8 +322,8 @@ 
 								echo '<li class="interest-group-count">' . sprintf( _n( '%d Interest Group', '%d Interest Groups', intval( count( $interest_groupings ) ), 'yikes-inc-easy-mailchimp-extender' ), intval( count( $interest_groupings ) ) ) . '</li>';
 								foreach ( $interest_groupings as $interest_group ) {
 									// Build up the total subscribers
-									$count = array_sum( wp_list_pluck( $interest_group['items'], 'subscriber_count' ) );
-									echo '<li><span class="dashicons dashicons-marker"></span>' . $interest_group['title'] . '<span class="interest-group-title"></span><small title="' . $count . ' ' . __( "subscribers assigned to this group", 'yikes-inc-easy-mailchimp-extender' ) . '">(' . $count . ')</small></li>';
+									$count = array_sum( wp_list_pluck( $interest_group[ 'items' ], 'subscriber_count' ) );
+									echo '<li><span class="dashicons dashicons-marker"></span>' . $interest_group[ 'title' ] . '<span class="interest-group-title"></span><small title="' . $count . ' ' . __( "subscribers assigned to this group", 'yikes-inc-easy-mailchimp-extender' ) . '">(' . $count . ')</small></li>';
 								}
 								?></ul><?php
 							} else {
@@ -347,17 +347,17 @@ 
 						<div class="postbox yikes-easy-mc-postbox">
 
 
-							<h3><?php _e( 'Segments Overview' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
+							<h3><?php _e( 'Segments Overview', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
 							<?php
-								if( isset( $segments['saved'] ) && count( $segments['saved'] ) >= 1 ) {
+								if ( isset( $segments[ 'saved' ] ) && count( $segments[ 'saved' ] ) >= 1 ) {
 									$i = 1;
 									?><ul class="segment-ul"><?php
-										echo '<li class="segment-group-count">' . sprintf( _n( '%d Segment', '%d Segments', intval( count( $segments['saved'] ) ), 'yikes-inc-easy-mailchimp-extender' ), intval( count( $segments['saved'] ) ) ) . '</li>';
-									foreach( $segments['saved'] as $segment ) {
-										echo '<li><span class="dashicons dashicons-arrow-right"></span>' . $segment['name'] . ' <small><a href="#" onclick="jQuery(this).parent().parent().next().slideToggle();jQuery(this).toggleText();return false;" data-alt-text="' . __( 'hide conditions' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( "view conditions" , 'yikes-inc-easy-mailchimp-extender' ) . '</a></small></li>';
+										echo '<li class="segment-group-count">' . sprintf( _n( '%d Segment', '%d Segments', intval( count( $segments[ 'saved' ] ) ), 'yikes-inc-easy-mailchimp-extender' ), intval( count( $segments[ 'saved' ] ) ) ) . '</li>';
+									foreach ( $segments[ 'saved' ] as $segment ) {
+										echo '<li><span class="dashicons dashicons-arrow-right"></span>' . $segment[ 'name' ] . ' <small><a href="#" onclick="jQuery(this).parent().parent().next().slideToggle();jQuery(this).toggleText();return false;" data-alt-text="' . __( 'hide conditions', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( "view conditions", 'yikes-inc-easy-mailchimp-extender' ) . '</a></small></li>';
 										?><div class="conditionals yikes-easy-mc-hidden"><?php
-										foreach( $segment['segment_opts']['conditions'] as $condition ) {
-											echo '<li><small>' . sprintf( __( 'condition #%s : If %s %s %s', 'yikes-inc-easy-mailchimp-extender' ), intval( $i ), $condition['field'],  $condition['op'], $condition['value'] ) . '</small></li>';
+										foreach ( $segment[ 'segment_opts' ][ 'conditions' ] as $condition ) {
+											echo '<li><small>' . sprintf( __( 'condition #%s : If %s %s %s', 'yikes-inc-easy-mailchimp-extender' ), intval( $i ), $condition[ 'field' ], $condition[ 'op' ], $condition[ 'value' ] ) . '</small></li>';
 											$i++;
 										}
 										?></div><?php
@@ -372,9 +372,9 @@ 
 								}
 							?>
 							<!--
-								<a class="edit-segments-button" href="#" onclick="return false;" class="button-primary"><?php _e( 'Edit Segments' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+								<a class="edit-segments-button" href="#" onclick="return false;" class="button-primary"><?php _e( 'Edit Segments', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 							-->
-							<p class="description edit-segment-description"><?php _e( 'To edit this lists segments, head over to' , 'yikes-inc-easy-mailchimp-extender' ); ?> <a href="http://www.MailChimp.com" target="_blank">MailChimp</a></p>
+							<p class="description edit-segment-description"><?php _e( 'To edit this lists segments, head over to', 'yikes-inc-easy-mailchimp-extender' ); ?> <a href="http://www.MailChimp.com" target="_blank">MailChimp</a></p>
 
 						</div>
 

admin/partials/view-user.php

Spacing +34 added lines, -34 removed lines

@@ -3,8 +3,8 @@ 
 *	Get and store our variables
 *	@since 6.0
 */
-$list_id     = $_GET['mailchimp-list'];
-$email_id    = esc_attr( $_GET['email-id'] );
+$list_id     = $_GET[ 'mailchimp-list' ];
+$email_id    = esc_attr( $_GET[ 'email-id' ] );
 $list_helper = yikes_get_mc_api_manager()->get_list_handler();
 
 /*
@@ -36,14 +36,14 @@ 
 }
 
 $other_lists      = $list_helper->get_members_lists( $email_id );
-$merge_data_array = $user_data['merge_fields'];
+$merge_data_array = $user_data[ 'merge_fields' ];
 
 $additional_lists = array();
 $merge_variable_fields = array();
 
 /* Build the array of mailing lists the user is subscribed to */
 foreach ( $other_lists as $id => $value ) {
-	if ( 'subscribed' !== $value['status'] ) {
+	if ( 'subscribed' !== $value[ 'status' ] ) {
 		continue;
 	}
 
@@ -58,7 +58,7 @@ 
 		continue;
 	}
 
-	$additional_lists[ $list_data['id'] ] = $list_data['name'];
+	$additional_lists[ $list_data[ 'id' ] ] = $list_data[ 'name' ];
 }
 
 /* Build the array of merge variables => value */
@@ -74,21 +74,21 @@ 
 }
 // loop and display
 if ( $merge_variables ) {
-	foreach ( $merge_variables['merge_fields'] as $merge_variable ) {
-		if ( $merge_variable['tag'] != 'EMAIL' ) {
-			$merge_variable_fields[ $merge_variable['name'] ] = ( isset( $merge_data_array[ $merge_variable['tag'] ] ) ) ? $merge_data_array[ $merge_variable['tag'] ] : '';
+	foreach ( $merge_variables[ 'merge_fields' ] as $merge_variable ) {
+		if ( $merge_variable[ 'tag' ] != 'EMAIL' ) {
+			$merge_variable_fields[ $merge_variable[ 'name' ] ] = ( isset( $merge_data_array[ $merge_variable[ 'tag' ] ] ) ) ? $merge_data_array[ $merge_variable[ 'tag' ] ] : '';
 		}
 	}
 }
 
 
 // store usable data
-$user_email = sanitize_email( $user_data['email_address'] );
+$user_email = sanitize_email( $user_data[ 'email_address' ] );
 // prepend our email address to the beginning
 $merge_variable_fields = array( 'Email Address' => $user_email ) + $merge_variable_fields;
 $gravatar_image        = get_avatar( $user_email, 120 );
-$email_type            = $user_data['email_type'];
-$member_rating         = ( ! empty( $user_data['member_rating'] ) ) ? (int) $user_data['member_rating'] : 0;
+$email_type            = $user_data[ 'email_type' ];
+$member_rating         = ( ! empty( $user_data[ 'member_rating' ] ) ) ? (int) $user_data[ 'member_rating' ] : 0;
 $member_rating_stars   = '';
 
 // Create member rating stars
@@ -100,8 +100,8 @@ 
 	}
 }
 
-$last_changed  = strtotime( $user_data['last_changed'] );
-$user_language = ( ! empty( $user_data['language'] ) ) ? $user_data['language'] : '';
+$last_changed  = strtotime( $user_data[ 'last_changed' ] );
+$user_language = ( ! empty( $user_data[ 'language' ] ) ) ? $user_data[ 'language' ] : '';
 $list_name     = $additional_lists[ $list_id ];
 
 // Generate our display page
@@ -138,14 +138,14 @@ 
 				<span class="member-subscription-date">
 						<?php echo __( 'Subscribed:', 'yikes-inc-easy-mailchimp-extender' ) . ' ' . gmdate( 'F jS, Y h:i a', $last_changed ); ?>
 					</span>
-				<?php if ( isset( $user_data['location'] ) && ! empty( $user_data['location'] ) ) { ?>
-					<?php if ( isset( $user_data['location']['latitude'] ) && isset( $user_data['location']['longitude'] ) ) { ?>
+				<?php if ( isset( $user_data[ 'location' ] ) && ! empty( $user_data[ 'location' ] ) ) { ?>
+					<?php if ( isset( $user_data[ 'location' ][ 'latitude' ] ) && isset( $user_data[ 'location' ][ 'longitude' ] ) ) { ?>
 						<span class="member-location-data">
-								<?php echo __( 'Location:', 'yikes-inc-easy-mailchimp-extender' ) . ' ' . yikes_mc_geocode_subscriber_data( $user_data['location']['latitude'], $user_data['location']['longitude'] ); ?>
+								<?php echo __( 'Location:', 'yikes-inc-easy-mailchimp-extender' ) . ' ' . yikes_mc_geocode_subscriber_data( $user_data[ 'location' ][ 'latitude' ], $user_data[ 'location' ][ 'longitude' ] ); ?>
 							</span>
 					<?php } else { ?>
 						<span class="member-location-data">
-							<?php echo __( 'Location:', 'yikes-inc-easy-mailchimp-extender' ) . ' ' . $user_data['location']['timezone'] . ', ' . $user_data['location']['country_code']; ?>
+							<?php echo __( 'Location:', 'yikes-inc-easy-mailchimp-extender' ) . ' ' . $user_data[ 'location' ][ 'timezone' ] . ', ' . $user_data[ 'location' ][ 'country_code' ]; ?>
 						</span>
 						<?php
 					}
@@ -156,7 +156,7 @@ 
 			<hr class="yikes-mc-subscriber-hr" />
 
 			<?php
-			if ( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && $_GET['section'] == 'subscriber-data' ) ) {
+			if ( ! isset( $_GET[ 'section' ] ) || ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'subscriber-data' ) ) {
 			?>
 			<section class="yikes-mc-card-body merge-variable-section">
 				<h3><?php _e( 'Fields:', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
@@ -176,11 +176,11 @@ 
 					<strong><?php _e( 'No Subscriber Data Found', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 					<?php
 				}
-				if ( isset( $user_data['ip_signup'] ) && $user_data['ip_signup'] != '' ) {
+				if ( isset( $user_data[ 'ip_signup' ] ) && $user_data[ 'ip_signup' ] != '' ) {
 					?>
 					<li>
 						<label>
-							<strong class="section-label"><?php echo __( 'Signup IP', 'yikes-inc-easy-mailchimp-extender' ) . '</strong><p class="section-value"><em>' . $user_data['ip_signup']; ?></strong></p>
+							<strong class="section-label"><?php echo __( 'Signup IP', 'yikes-inc-easy-mailchimp-extender' ) . '</strong><p class="section-value"><em>' . $user_data[ 'ip_signup' ]; ?></strong></p>
 						</label>
 					</li>
 					<?php
@@ -191,7 +191,7 @@ 
 			<?php
 
 
-			if ( isset( $_GET['section'] ) && $_GET['section'] == 'additional-subscriptions' ) {
+			if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'additional-subscriptions' ) {
 				?>
 				<section class="yikes-mc-card-body">
 					<?php
@@ -220,7 +220,7 @@ 
 			?>
 
 			<?php
-			if ( isset( $_GET['section'] ) && $_GET['section'] == 'delete-subscriber' ) {
+			if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'delete-subscriber' ) {
 				$unsubscribe_subscriber_url = esc_url_raw( add_query_arg( array(
 					'action'         => 'yikes-easy-mc-unsubscribe-user',
 					'mailchimp-list' => $list_id,
@@ -275,36 +275,36 @@ 
 		<div id="customer-tab-wrapper">
 			<ul id="customer-tab-wrapper-list">
 
-				<?php if ( isset( $_GET['section'] ) && $_GET['section'] != 'subscriber-data' ) { ?>
+				<?php if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] != 'subscriber-data' ) { ?>
 				<a title="<?php _e( 'Subscriber Details', 'yikes-inc-easy-mailchimp-extender' ); ?>" aria-label="<?php _e( 'Subscriber Details', 'yikes-inc-easy-mailchimp-extender' ); ?>" href="<?php echo $subscriber_details; ?>">
 					<?php } ?>
 
-					<li <?php if ( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && $_GET['section'] == 'subscriber-data' ) ) { ?>class="active" <?php } else { ?>class="inactive"<?php } ?>>
+					<li <?php if ( ! isset( $_GET[ 'section' ] ) || ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'subscriber-data' ) ) { ?>class="active" <?php } else { ?>class="inactive"<?php } ?>>
 						<span class="dashicons  dashicons-id"></span></li>
 
-					<?php if ( isset( $_GET['section'] ) && $_GET['section'] != 'subscriber-data' ) { ?>
+					<?php if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] != 'subscriber-data' ) { ?>
 				</a>
 			<?php } ?>
 
-				<?php if ( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && $_GET['section'] != 'additional-subscriptions' ) ) { ?>
+				<?php if ( ! isset( $_GET[ 'section' ] ) || ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] != 'additional-subscriptions' ) ) { ?>
 				<a title="<?php _e( 'Additional Subscriptions', 'yikes-inc-easy-mailchimp-extender' ); ?>" aria-label="<?php _e( 'Additional Subscriptions', 'yikes-inc-easy-mailchimp-extender' ); ?>" href="<?php echo $additional_subscription_url; ?>">
 					<?php } ?>
 
-					<li <?php if ( isset( $_GET['section'] ) && $_GET['section'] == 'additional-subscriptions' ) { ?>class="active" <?php } else { ?>class="inactive"<?php } ?>>
+					<li <?php if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'additional-subscriptions' ) { ?>class="active" <?php } else { ?>class="inactive"<?php } ?>>
 						<span class="dashicons dashicons-portfolio"></span></li>
 
-					<?php if ( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && $_GET['section'] == 'additional-subscriptions' ) ) { ?>
+					<?php if ( ! isset( $_GET[ 'section' ] ) || ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'additional-subscriptions' ) ) { ?>
 				</a>
 			<?php } ?>
 
-				<?php if ( ! isset( $_GET['section'] ) || isset( $_GET['section'] ) && $_GET['section'] != 'delete-subscriber' ) { ?>
+				<?php if ( ! isset( $_GET[ 'section' ] ) || isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] != 'delete-subscriber' ) { ?>
 				<a title="<?php _e( 'Delete Subscriber', 'yikes-inc-easy-mailchimp-extender' ); ?>" aria-label="<?php _e( 'Delete Subscriber', 'yikes-inc-easy-mailchimp-extender' ); ?>" href="<?php echo $delete_subscriber_url; ?>">
 					<?php } ?>
 
-					<li <?php if ( isset( $_GET['section'] ) && $_GET['section'] == 'delete-subscriber' ) { ?>class="active" <?php } else { ?>class="inactive"<?php } ?>>
+					<li <?php if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'delete-subscriber' ) { ?>class="active" <?php } else { ?>class="inactive"<?php } ?>>
 						<span class="dashicons dashicons-trash"></span></li>
 
-					<?php if ( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && $_GET['section'] == 'delete-subscriber' ) ) { ?>
+					<?php if ( ! isset( $_GET[ 'section' ] ) || ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'delete-subscriber' ) ) { ?>
 				</a>
 			<?php } ?>
 
@@ -326,9 +326,9 @@ 
 	if ( is_wp_error( $geocode_response_body ) ) {
 		return;
 	}
-	$city    = $geocode_response_body['results'][0]['address_components'][2]['short_name'];
-	$state   = $geocode_response_body['results'][0]['address_components'][5]['short_name'];
-	$country = $geocode_response_body['results'][0]['address_components'][6]['short_name'];
+	$city    = $geocode_response_body[ 'results' ][ 0 ][ 'address_components' ][ 2 ][ 'short_name' ];
+	$state   = $geocode_response_body[ 'results' ][ 0 ][ 'address_components' ][ 5 ][ 'short_name' ];
+	$country = $geocode_response_body[ 'results' ][ 0 ][ 'address_components' ][ 6 ][ 'short_name' ];
 
 	return $link = '<a href="http://maps.google.com/maps?q=' . $latitude . ',' . $longitude . '" target="_blank" title="' . __( 'View Google Map', 'yikes-inc-easy-mailchimp-extender' ) . '">' . $city . ', ' . $state . ', ' . $country . '</a>&nbsp;<span class="flag-icon flag-icon-' . strtolower( $country ) . '"></span>';
 }

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

Spacing +5 added lines, -5 removed lines

@@ -96,8 +96,8 @@ 
 
 		$this->api_key = $api_key;
 		$parts         = $this->get_api_key_parts();
-		$this->key     = $parts['key'];
-		$this->dc      = $parts['dc'];
+		$this->key     = $parts[ 'key' ];
+		$this->dc      = $parts[ 'dc' ];
 	}
 
 	/**
@@ -122,8 +122,8 @@ 
 		$parts = explode( '-', $this->api_key );
 
 		return array(
-			'key' => $parts[0],
-			'dc'  => isset( $parts[1] ) ? $parts[1] : '',
+			'key' => $parts[ 0 ],
+			'dc'  => isset( $parts[ 1 ] ) ? $parts[ 1 ] : '',
 		);
 	}
 
@@ -167,7 +167,7 @@ 
 	 * @return Yikes_Inc_Easy_MailChimp_API
 	 */
 	public function get_api( $version = '' ) {
-		$version = $version ?: $this->get_default_api_version();
+		$version = $version ? : $this->get_default_api_version();
 
 		if ( ! array_key_exists( $version, $this->api ) || null === $this->api[ $version ] ) {
 			$this->api[ $version ] = new Yikes_Inc_Easy_MailChimp_API( $this->get_datacenter(), $this->get_api_key(), $version );

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

admin/partials/menu/options.php

Spacing +24 added lines, -24 removed lines

@@ -5,13 +5,13 @@ 
 */
 
 	/* Get and Store Option Values */
-	if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) === 'valid_api_key' ) {
-		$api_connection = '<span id="connection-container" class="api-connected" title="' . __( "Your site is currently connected to the MailChimp API" , "yikes-inc-easy-mailchimp-extender" ) . '"><span class="dashicons dashicons-yes yikes-mc-api-connected"></span> ' . __( "Connected" , 'yikes-inc-easy-mailchimp-extender' ) . '</span>';
+	if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) === 'valid_api_key' ) {
+		$api_connection = '<span id="connection-container" class="api-connected" title="' . __( "Your site is currently connected to the MailChimp API", "yikes-inc-easy-mailchimp-extender" ) . '"><span class="dashicons dashicons-yes yikes-mc-api-connected"></span> ' . __( "Connected", 'yikes-inc-easy-mailchimp-extender' ) . '</span>';
 		$api_error_response = '';
 	} else {
-		$api_connection = '<span id="connection-container" class="api-not-connected"><span class="dashicons dashicons-no-alt yikes-mc-api-not-connected"></span>  ' . __( "Not Connected" , 'yikes-inc-easy-mailchimp-extender' ) . '</span>';
-		if( get_option( 'yikes-mc-api-invalid-key-response' , '' ) != '' ) {
-			$api_error_response = '<p><small><i class="dashicons dashicons-no-alt"></i> ' . get_option( 'yikes-mc-api-invalid-key-response' , '' ) . '</small></p>';
+		$api_connection = '<span id="connection-container" class="api-not-connected"><span class="dashicons dashicons-no-alt yikes-mc-api-not-connected"></span>  ' . __( "Not Connected", 'yikes-inc-easy-mailchimp-extender' ) . '</span>';
+		if ( get_option( 'yikes-mc-api-invalid-key-response', '' ) != '' ) {
+			$api_error_response = '<p><small><i class="dashicons dashicons-no-alt"></i> ' . get_option( 'yikes-mc-api-invalid-key-response', '' ) . '</small></p>';
 		} else {
 			$api_error_response = '';
 		}
@@ -23,8 +23,8 @@ 
 	* @since 6.2.2
 	*
 	*/
-	if ( isset( $_REQUEST['section'] ) ) {
-		$_REQUEST['section'] = preg_replace('/[^\w-]/', '', strip_tags ( $_REQUEST['section'] ) );
+	if ( isset( $_REQUEST[ 'section' ] ) ) {
+		$_REQUEST[ 'section' ] = preg_replace( '/[^\w-]/', '', strip_tags( $_REQUEST[ 'section' ] ) );
 	}
 ?>
 	<!-- Actual Settings Form
@@ -32,15 +32,15 @@ 
 	<div class="wrap">
 
 		<!-- Freddie Logo -->
-		<img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - MailChimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
+		<img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - MailChimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
 
-		<h1>Easy Forms for MailChimp | <?php if ( isset( $_REQUEST['section'] ) ) { echo ucwords( str_replace( '-', ' ', $_REQUEST['section'] ) ); } else { echo __( 'General Settings' , 'yikes-inc-easy-mailchimp-extender' ); } ?></h1>
+		<h1>Easy Forms for MailChimp | <?php if ( isset( $_REQUEST[ 'section' ] ) ) { echo ucwords( str_replace( '-', ' ', $_REQUEST[ 'section' ] ) ); } else { echo __( 'General Settings', 'yikes-inc-easy-mailchimp-extender' ); } ?></h1>
 
 		<!-- Settings Page Description -->
-		<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Manage the overall settings for Easy forms for MailChimp.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Manage the overall settings for Easy forms for MailChimp.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 		<?php
 			/* Success Messages on Options Updated */
-			if( isset( $_REQUEST['settings-updated'] ) && $_REQUEST['settings-updated'] == 'true' ) {
+			if ( isset( $_REQUEST[ 'settings-updated' ] ) && $_REQUEST[ 'settings-updated' ] == 'true' ) {
 				?>
 				<div class="updated manage-form-admin-notice">
 					<p><?php _e( 'Settings successfully updated.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -48,7 +48,7 @@ 
 				<?php
 			}
 			/* MailChimp API Cleared Successfully message */
-			if( isset( $_REQUEST['transient-cleared'] ) && $_REQUEST['transient-cleared'] == 'true' ) {
+			if ( isset( $_REQUEST[ 'transient-cleared' ] ) && $_REQUEST[ 'transient-cleared' ] == 'true' ) {
 				?>
 				<div class="updated manage-form-admin-notice">
 					<p><?php _e( 'MailChimp API Cache successfully cleared.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -57,7 +57,7 @@ 
 			}
 			/* Error Log Clear Messages */
 				/* Success Messages on Options Updated */
-				if( isset( $_REQUEST['error-log-cleared'] ) && $_REQUEST['error-log-cleared'] == 'true' ) {
+				if ( isset( $_REQUEST[ 'error-log-cleared' ] ) && $_REQUEST[ 'error-log-cleared' ] == 'true' ) {
 					?>
 					<div class="updated manage-form-admin-notice">
 						<p><?php _e( 'Error log successfully cleared.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -65,7 +65,7 @@ 
 					<?php
 				}
 				/* MailChimp API Cleared Successfully message */
-				if( isset( $_REQUEST['error-log-cleared'] ) && $_REQUEST['error-log-cleared'] == 'false' ) {
+				if ( isset( $_REQUEST[ 'error-log-cleared' ] ) && $_REQUEST[ 'error-log-cleared' ] == 'false' ) {
 					?>
 					<div class="error manage-form-admin-notice">
 						<p><?php _e( "Whoops! We've encountered an error while trying to clear the error log. Please refresh the page and try again. If the error persists please get in touch with the YIKES Inc. support team.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -74,28 +74,28 @@ 
 				}
 
 				/* Display a success message if our error log was sucessfully created, or display an error if not */
-				if( isset( $_GET['error_log_created'] ) && $_GET['error_log_created'] == 'true' ) {
+				if ( isset( $_GET[ 'error_log_created' ] ) && $_GET[ 'error_log_created' ] == 'true' ) {
 					?>
 					<div class="updated">
 						<p><?php _e( 'Error log successfully created. You may now start logging errors.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 					</div>
 					<?php
-				} else if( isset( $_GET['error_log_created'] ) && $_GET['error_log_created'] == 'false' ) {
+				} else if ( isset( $_GET[ 'error_log_created' ] ) && $_GET[ 'error_log_created' ] == 'false' ) {
 					?>
 					<div class="error">
-						<p><?php echo esc_attr( urldecode( $_GET['error_message'] ) , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+						<p><?php echo esc_attr( urldecode( $_GET[ 'error_message' ] ), 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 					</div>
 					<?php
 				}
 
 				/* Display a success message if the user successfully imported some forms */
-				if( isset( $_GET['section'] ) && $_GET['section'] == 'import-export-forms' && isset( $_GET['import-forms'] ) && $_GET['import-forms'] == 'true' ) {
+				if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'import-export-forms' && isset( $_GET[ 'import-forms' ] ) && $_GET[ 'import-forms' ] == 'true' ) {
 					?>
 					<div class="updated">
 						<p><?php printf( __( 'Opt-in forms successfully imported. <a href="%s" title="View Forms">View Forms</a>', 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?></p>
 					</div>
 					<?php
-				} elseif( isset( $_GET['section'] ) && $_GET['section'] == 'import-export-forms' && isset( $_GET['import-settings'] ) && $_GET['import-settings'] == 'true' ) {
+				} elseif ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'import-export-forms' && isset( $_GET[ 'import-settings' ] ) && $_GET[ 'import-settings' ] == 'true' ) {
 					?>
 					<div class="updated">
 						<p><?php printf( __( 'YIKES Easy Forms for MailChimp settings successfully imported.', 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?></p>
@@ -116,11 +116,11 @@ 
 
 						<div class="postbox yikes-easy-mc-postbox">
 
-							<?php if( !isset( $_REQUEST['section'] ) || $_REQUEST['section'] == '' ) {
+							<?php if ( ! isset( $_REQUEST[ 'section' ] ) || $_REQUEST[ 'section' ] == '' ) {
 								include YIKES_MC_PATH . 'admin/partials/menu/options-sections/general-settings.php';
 							} else {
-								if( isset( $_REQUEST['addon'] ) && $_REQUEST['addon'] == 'true' ) {
-									include apply_filters( 'yikes-mailchimp-'.$_REQUEST['section'].'-options-path' , '' );
+								if ( isset( $_REQUEST[ 'addon' ] ) && $_REQUEST[ 'addon' ] == 'true' ) {
+									include apply_filters( 'yikes-mailchimp-' . $_REQUEST[ 'section' ] . '-options-path', '' );
 								} else {
 									// White list a set of files that are allowed to be included here
 									$file_base = 'admin/partials/menu/options-sections/';
@@ -133,8 +133,8 @@ 
 										$file_base . 'recaptcha-settings.php',
 									);
 									// Ensure the included file is allowed and whitelisted above, before including it
-									if ( 0 === validate_file( 'admin/partials/menu/options-sections/' . $_REQUEST['section'] . '.php', $acceptable_files ) ) {
-										include YIKES_MC_PATH . 'admin/partials/menu/options-sections/' . $_REQUEST['section'] . '.php';
+									if ( 0 === validate_file( 'admin/partials/menu/options-sections/' . $_REQUEST[ 'section' ] . '.php', $acceptable_files ) ) {
+										include YIKES_MC_PATH . 'admin/partials/menu/options-sections/' . $_REQUEST[ 'section' ] . '.php';
 									} else {
 										wp_die( esc_attr__( 'Invalid file. If this error persists, please contact support.', 'yikes-inc-easy-mailchimp' ) );
 									}

admin/partials/menu/add-ons.php

Spacing +3 added lines, -3 removed lines

@@ -7,12 +7,12 @@
 <div class="wrap">
 
 	<!-- Freddie Logo -->
-	<img src="<?php echo esc_url( YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png' ); ?>" alt="<?php esc_attr_e( 'Freddie - MailChimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
+	<img src="<?php echo esc_url( YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png' ); ?>" alt="<?php esc_attr_e( 'Freddie - MailChimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
 
-	<h1>Easy Forms for MailChimp | <?php echo esc_attr__( 'Add-Ons' , 'yikes-inc-easy-mailchimp-extender' ); ?> &nbsp; <a href="https://yikesplugins.com/plugins/?plugins=MailChimp" target="_blank" class="button-primary coming-soon-button" title="<?php esc_attr_e( 'View All Add-Ons' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php esc_attr_e( 'View All Add-Ons' , 'yikes-inc-easy-mailchimp-extender' ); ?> <span class="dashicons dashicons-external"></span></a></h1>
+	<h1>Easy Forms for MailChimp | <?php echo esc_attr__( 'Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?> &nbsp; <a href="https://yikesplugins.com/plugins/?plugins=MailChimp" target="_blank" class="button-primary coming-soon-button" title="<?php esc_attr_e( 'View All Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php esc_attr_e( 'View All Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?> <span class="dashicons dashicons-external"></span></a></h1>
 
 	<!-- Addons Page Description -->
-	<p class="yikes-easy-mc-about-text about-text"><?php esc_attr_e( "Below you'll find all free and paid add-ons available for Easy Forms for MailChimp. Each add-on extends the functionality of the free plugin." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+	<p class="yikes-easy-mc-about-text about-text"><?php esc_attr_e( "Below you'll find all free and paid add-ons available for Easy Forms for MailChimp. Each add-on extends the functionality of the free plugin.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
 	<!-- Add-On Container -->
 	<section id="add-ons">

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

Spacing +11 added lines, -11 removed lines

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