yikesinc / yikes-inc-easy-mailchimp-extender

includes/add_ons/eu-compliance.php

Spacing +1 added lines, -1 removed lines

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

includes/add_ons/reverse-zip-lookup.php

Spacing +1 added lines, -1 removed lines

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

includes/add_ons/incentives.php

Spacing +1 added lines, -1 removed lines

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

includes/add_ons/customizer.php

Spacing +1 added lines, -1 removed lines

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

admin/partials/menu/options-sections/api-cache-settings.php

Spacing +5 added lines, -5 removed lines

@@ -3,18 +3,18 @@
 	-	Clear MailChimp transient data such as forms, form fields, list data, subscribers etc.
 		*	transient cache is stored for 60 minutes.
 -->
-<h3><span><?php _e( 'API Cache Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
+<h3><span><?php _e( 'API Cache Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
 <div class="inside">
 									
 	<!-- Settings Form -->
-	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-clear-transient-data' , 'nonce' => wp_create_nonce( 'clear-mc-transient-data' ) ) ) ); ?>" method="post">							
+	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-clear-transient-data', 'nonce' => wp_create_nonce( 'clear-mc-transient-data' ) ) ) ); ?>" method="post">							
 									
-		<p><?php _e( "Delete all MailChimp data stored in your sites cache. Most data is stored in the cache for 1 hour." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<p><?php _e( "Delete all MailChimp data stored in your sites cache. Most data is stored in the cache for 1 hour.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 			<!-- check if any of our transients contain data -->							
 			<?php if ( false === get_transient( 'yikes-easy-mailchimp-list-data' ) && false === get_transient( 'yikes-easy-mailchimp-profile-data' ) && false === get_transient( 'yikes-easy-mailchimp-account-data' ) && false === get_transient( 'yikesinc_eme_list_ids' ) && false === get_transient( 'yikes_eme_lists' ) ) { ?>
-				<p><a href="#" class="button-secondary" disabled="disabled" title="<?php _e( 'No MailChimp data found in temporary cache storage.' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Clear MailChimp API Cache' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></p>
+				<p><a href="#" class="button-secondary" disabled="disabled" title="<?php _e( 'No MailChimp data found in temporary cache storage.', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Clear MailChimp API Cache', 'yikes-inc-easy-mailchimp-extender' ); ?></a></p>
 			<?php } else { ?>
-				<p><input type="submit" class="button-primary" value="<?php _e( 'Clear MailChimp API Cache' , 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
+				<p><input type="submit" class="button-primary" value="<?php _e( 'Clear MailChimp API Cache', 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
 			<?php } ?>
 									
 	</form>

admin/partials/view-list.php

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/ajax/class.ajax.php

Spacing +16 added lines, -16 removed lines

@@ -13,22 +13,22 @@ 
 		public function __construct() {
 
 			// Ajax send merge variable to form builder
-			add_action( 'wp_ajax_add_field_to_form', array( $this , 'send_field_to_form' ), 10 );
+			add_action( 'wp_ajax_add_field_to_form', array( $this, 'send_field_to_form' ), 10 );
 
 			// Ajax send interest group to form builder
-			add_action( 'wp_ajax_add_interest_group_to_form', array( $this , 'send_interest_group_to_form' ), 10 );
+			add_action( 'wp_ajax_add_interest_group_to_form', array( $this, 'send_interest_group_to_form' ), 10 );
 
 			// Return new list data + activity (for dashboard widget )
-			add_action( 'wp_ajax_get_new_list_data', array( $this , 'get_new_list_data' ), 10 );
+			add_action( 'wp_ajax_get_new_list_data', array( $this, 'get_new_list_data' ), 10 );
 
 			// Return new list data + activity (for dashboard widget )
-			add_action( 'wp_ajax_check_list_for_interest_groups', array( $this , 'check_list_for_interest_groups' ), 10 );
+			add_action( 'wp_ajax_check_list_for_interest_groups', array( $this, 'check_list_for_interest_groups' ), 10 );
 
 			// Add a new notification to a form
-			add_action( 'wp_ajax_add_notification_to_form', array( $this , 'add_notification_to_form' ), 10 , 1 );
+			add_action( 'wp_ajax_add_notification_to_form', array( $this, 'add_notification_to_form' ), 10, 1 );
 
 			// Save field label edits
-			add_action( 'wp_ajax_save_field_label_edits', array( $this , 'save_field_label_edits' ), 10 , 1 );
+			add_action( 'wp_ajax_save_field_label_edits', array( $this, 'save_field_label_edits' ), 10, 1 );
 		}
 
 		/*
@@ -36,7 +36,7 @@ 
 		*	- return a single container
 		*/
 		public function add_notification_to_form() {
-			if( $_POST['notification_name'] ) {
+			if ( $_POST[ 'notification_name' ] ) {
 				include_once( YIKES_MC_PATH . 'admin/partials/ajax/add_notification_to_form.php' );
 			}
 			exit();
@@ -46,7 +46,7 @@ 
 		// when the user wants to switch which form data
 		// is displayed on the dashboard
 		public function get_new_list_data() {
-			$list_id   = $_POST['list_id'];
+			$list_id   = $_POST[ 'list_id' ];
 			$list_data = yikes_get_mc_api_manager()->get_list_handler()->get_list( $list_id );
 			if ( is_wp_error( $list_data ) ) {
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
@@ -69,10 +69,10 @@ 
 		/* note: this function is called statically from the integration settings page */
 		public static function check_list_for_interest_groups( $list_id = '', $integration_type = '', $load = false ) {
 			if ( ! $list_id ) {
-				$list_id = $_POST['list_id'];
+				$list_id = $_POST[ 'list_id' ];
 			}
 			if ( ! $integration_type ) {
-				$integration_type = $_POST['integration'];
+				$integration_type = $_POST[ 'integration' ];
 			}
 
 
@@ -81,7 +81,7 @@ 
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
 				$error_logging->maybe_write_to_log( 
 					$interest_groupings->get_error_code(), 
-					__( "Get Interest Groups" , 'yikes-inc-easy-mailchimp-extender' ), 
+					__( "Get Interest Groups", 'yikes-inc-easy-mailchimp-extender' ), 
 					"class.ajax.php" 
 				);
 				$interest_groupings = array();
@@ -127,10 +127,10 @@ 
 		public function save_field_label_edits() {
 
 			// Capture our $_POST variables
-			$list_id	= isset( $_POST['list_id'] ) ? $_POST['list_id'] : '';
-			$field_data = isset( $_POST['field_data'] ) ? $_POST['field_data'] : array();
-			$field_name = isset( $field_data['field_name'] ) ? $field_data['field_name'] : '';
-			$field_id	= isset( $field_data['field_id'] ) ? $field_data['field_id'] : '';
+			$list_id = isset( $_POST[ 'list_id' ] ) ? $_POST[ 'list_id' ] : '';
+			$field_data = isset( $_POST[ 'field_data' ] ) ? $_POST[ 'field_data' ] : array();
+			$field_name = isset( $field_data[ 'field_name' ] ) ? $field_data[ 'field_name' ] : '';
+			$field_id = isset( $field_data[ 'field_id' ] ) ? $field_data[ 'field_id' ] : '';
 
 			// Make sure we have our required variables before continuing
 			if ( $list_id === '' || $field_name === '' || $field_id === '' ) {
@@ -149,7 +149,7 @@ 
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
 				$error_logging->maybe_write_to_log( 
 					$merge_field->get_error_code(), 
-					__( "Updating merge field" , 'yikes-inc-easy-mailchimp-extender' ), 
+					__( "Updating merge field", 'yikes-inc-easy-mailchimp-extender' ), 
 					"class.ajax.php"
 				);
 				wp_send_json_error( array(

admin/partials/helpers/init.php

Spacing +13 added lines, -13 removed lines

@@ -14,21 +14,21 @@ 
 			*		-	Link Text - Visible text for this link ie: 'Custom Section'
 			*		-	Dashicon - class of the icon you would like to use for this link
 			**/
-			public static function add_edit_form_section_link( $link_array=array() ) {
-				if( !empty( $link_array ) ) {
-					$link_data = wp_parse_args( array() , $link_array );
-					if( !empty( $link_data['text'] ) && !empty( $link_data['id'] ) ) {
-						if( !empty( $link_data['icon'] ) ) {
-							if( !isset( $link_data['icon_family'] ) || $link_data['icon_family'] == 'dashicons' || $link_data['icon_family'] == 'dashicon' ) {
-								$icon =  '<span class="dashicons dashicons-' . esc_attr__( $link_data['icon'] ) . ' yikes-easy-mailchimp-custom-content-icon"></span>';
+			public static function add_edit_form_section_link( $link_array = array() ) {
+				if ( ! empty( $link_array ) ) {
+					$link_data = wp_parse_args( array(), $link_array );
+					if ( ! empty( $link_data[ 'text' ] ) && ! empty( $link_data[ 'id' ] ) ) {
+						if ( ! empty( $link_data[ 'icon' ] ) ) {
+							if ( ! isset( $link_data[ 'icon_family' ] ) || $link_data[ 'icon_family' ] == 'dashicons' || $link_data[ 'icon_family' ] == 'dashicon' ) {
+								$icon = '<span class="dashicons dashicons-' . esc_attr__( $link_data[ 'icon' ] ) . ' yikes-easy-mailchimp-custom-content-icon"></span>';
 							} else {
-								$icon =  '<span class="' . esc_attr__( $link_data['icon'] ) . ' yikes-easy-mailchimp-custom-content-icon"></span>';
+								$icon = '<span class="' . esc_attr__( $link_data[ 'icon' ] ) . ' yikes-easy-mailchimp-custom-content-icon"></span>';
 							}
 						} else {
 							$icon = '';
 						}
 						$link = '<li class="hidden_setting_list">';
-							$link .= '<a class="hidden_setting ' . esc_attr__( $link_data['id'] ) . '" data-attr-container="' . esc_attr__( $link_data['id'] ) . '" onclick="return false;" title="' . esc_attr__( $link_data['text'] ) . '" href="#">' . $icon . esc_attr__( $link_data['text'] ) . '</a>';
+							$link .= '<a class="hidden_setting ' . esc_attr__( $link_data[ 'id' ] ) . '" data-attr-container="' . esc_attr__( $link_data[ 'id' ] ) . '" onclick="return false;" title="' . esc_attr__( $link_data[ 'text' ] ) . '" href="#">' . $icon . esc_attr__( $link_data[ 'text' ] ) . '</a>';
 						$link .= '</li>';
 						echo $link;
 					}
@@ -47,9 +47,9 @@ 
 			*		-	Sidebar Title - title of the sidebar section
 			*		-	Class - class to reference funtions out of (optiona, if left blank functions should be defined in functions.php (or outside of a class))
 			**/
-			public static function add_edit_form_section( $section_array=array() ) {
-				if( !empty( $section_array ) ) {
-					$section_data = wp_parse_args( array() , $section_array );
+			public static function add_edit_form_section( $section_array = array() ) {
+				if ( ! empty( $section_array ) ) {
+					$section_data = wp_parse_args( array(), $section_array );
 					ob_start();
 					include ( YIKES_MC_PATH . 'admin/partials/helpers/edit-form-hidden-section-template.php' );
 					$section = ob_get_contents();
@@ -66,7 +66,7 @@ 
 			*/
 			public static function is_custom_section_two_column( $custom_section_data ) {
 				// print_r( $custom_section_data );
-				$value = ( isset( $custom_section_data['sidebar_title'] ) && isset( $custom_section_data['sidebar_fields'] ) && !empty( $custom_section_data['sidebar_fields'] ) ) ?  true : false;
+				$value = ( isset( $custom_section_data[ 'sidebar_title' ] ) && isset( $custom_section_data[ 'sidebar_fields' ] ) && ! empty( $custom_section_data[ 'sidebar_fields' ] ) ) ?  true : false;
 				return $value;
 			}
 			

admin/partials/helpers/free-support.php

Spacing +3 added lines, -3 removed lines

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