yikesinc / yikes-inc-easy-mailchimp-extender

admin/partials/dashboard-widgets/class.list-activity-widget.php

Indentation +4 added lines, -4 removed lines

@@ -54,8 +54,8 @@ 
 		}
 					
 		/**
-		* Create the function to output our list stats dashboard widget
-		*/
+		 * Create the function to output our list stats dashboard widget
+		 */
 		function list_stats_dashboard_widget() {
 				// Get our list data!
 				// Check for a transient, if not - set one up for one hour
@@ -115,8 +115,8 @@ 
 		} 
 		
 		/**
-		* Create the function to output our account activity dashboard widget
-		*/
+		 * Create the function to output our account activity dashboard widget
+		 */
 		function account_activity_dashboard_widget() {
 				// Get our list data!
 				// Check for a transient, if not - set one up for one hour

Spacing +29 added lines, -29 removed lines

@@ -7,23 +7,23 @@ 
 
 		// Construction
 		public function __construct() {
-			if( yikes_get_mc_api_key() != '' && get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) == 'valid_api_key' ) {
+			if ( yikes_get_mc_api_key() != '' && get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'valid_api_key' ) {
 				// hook in and display our list stats dashboard widget
-				add_action( 'wp_dashboard_setup', array( $this , 'yks_mc_add_chimp_chatter_dashboard_widget' ) , 10 );
+				add_action( 'wp_dashboard_setup', array( $this, 'yks_mc_add_chimp_chatter_dashboard_widget' ), 10 );
 			}
-			add_action( 'admin_enqueue_scripts' , array( $this, 'enqueue_dashboard_widget_script' ) );
+			add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_dashboard_widget_script' ) );
 		}
 
 		// enqueue our JS file on the main dashboard page
 		function enqueue_dashboard_widget_script( $hook ) {
-			if( 'index.php' == $hook ) { // default 'dashboard' page
-				wp_register_script( 'yikes-easy-mc-dashboard-widget-script' , YIKES_MC_URL . 'admin/js/min/yikes-inc-easy-mailchimp-dashboard-widget.min.js' , array( 'jquery' ) , 'all' , false );
+			if ( 'index.php' == $hook ) { // default 'dashboard' page
+				wp_register_script( 'yikes-easy-mc-dashboard-widget-script', YIKES_MC_URL . 'admin/js/min/yikes-inc-easy-mailchimp-dashboard-widget.min.js', array( 'jquery' ), 'all', false );
 				$data_array = array(
 					'ajax_url' => esc_url_raw( admin_url( 'admin-ajax.php' ) ),
-					'preloader' => '<img src="' . esc_url_raw( admin_url( 'images/wpspin_light.gif' ) ) . '" title="' . __( 'Preloader' , 'yikes-inc-easy-mailchimp-extender' ) . '" alt="' . __( 'Preloader' , 'yikes-inc-easy-mailchimp-extender' ) . '" class="yikes-easy-mc-widget-preloader">'
+					'preloader' => '<img src="' . esc_url_raw( admin_url( 'images/wpspin_light.gif' ) ) . '" title="' . __( 'Preloader', 'yikes-inc-easy-mailchimp-extender' ) . '" alt="' . __( 'Preloader', 'yikes-inc-easy-mailchimp-extender' ) . '" class="yikes-easy-mc-widget-preloader">'
 				);
 				// localize our data, to pass along to JS file
-				wp_localize_script( 'yikes-easy-mc-dashboard-widget-script' , 'object' , $data_array );
+				wp_localize_script( 'yikes-easy-mc-dashboard-widget-script', 'object', $data_array );
 				wp_enqueue_script( 'yikes-easy-mc-dashboard-widget-script' );
 			}
 		}
@@ -41,15 +41,15 @@ 
 			if ( current_user_can( apply_filters( 'yikes-mailchimp-admin-widget-capability', apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) ) {
 				/* List Stats Dashboard Widget */
 				wp_add_dashboard_widget(
-					 'yikes_easy_mc_list_stats_widget',         // Widget slug.
-					 __( 'MailChimp List Stats', 'yikes-inc-easy-mailchimp-extender' ),         // Title.
-					array( $this , 'list_stats_dashboard_widget' ) // Display function.
+					 'yikes_easy_mc_list_stats_widget', // Widget slug.
+					 __( 'MailChimp List Stats', 'yikes-inc-easy-mailchimp-extender' ), // Title.
+					array( $this, 'list_stats_dashboard_widget' ) // Display function.
 				);
 				/* Chimp Chatter Dashboard Widget */
 				wp_add_dashboard_widget(
-					 'yikes_easy_mc_account_activity_widget',         // Widget slug.
-					 __( 'MailChimp Account Activity', 'yikes-inc-easy-mailchimp-extender' ),         // Title.
-					array( $this , 'account_activity_dashboard_widget' ) // Display function.
+					 'yikes_easy_mc_account_activity_widget', // Widget slug.
+					 __( 'MailChimp Account Activity', 'yikes-inc-easy-mailchimp-extender' ), // Title.
+					array( $this, 'account_activity_dashboard_widget' ) // Display function.
 				);
 			}
 		}
@@ -63,7 +63,7 @@ 
 				if ( false === ( $list_data = get_transient( 'yikes-easy-mailchimp-list-data' ) ) ) {
 					$api_key = yikes_get_mc_api_key();
 					$dash_position = strpos( $api_key, '-' );
-					if( $dash_position !== false ) {
+					if ( $dash_position !== false ) {
 						$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/list.json';
 					}
 					$list_data = wp_remote_post( $api_endpoint, array(
@@ -75,11 +75,11 @@ 
 						'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 					) );
 					$list_data = json_decode( wp_remote_retrieve_body( $list_data ), true );
-					if( isset( $list_data['error'] ) ) {
-						if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+					if ( isset( $list_data[ 'error' ] ) ) {
+						if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 							require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 							$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-							$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data['error'], __( "Get Account Lists" , 'yikes-inc-easy-mailchimp-extender' ), "Dashboard Activity Widget" );
+							$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data[ 'error' ], __( "Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ), "Dashboard Activity Widget" );
 						}
 					} else {
 						// set our transient
@@ -88,29 +88,29 @@ 
 				}
 			?>
 				<!-- Dropdown to Change the list -->
-				<?php if( ! empty( $list_data['data'] ) ) {
+				<?php if ( ! empty( $list_data[ 'data' ] ) ) {
 					?><section class="inside-widget yikes-dashboard-widget-section">
-							<strong class="select-list-title"><?php _e( 'Select a list' , 'yikes-inc-easy-mailchimp-extender' ) ?>:</strong>
+							<strong class="select-list-title"><?php _e( 'Select a list', 'yikes-inc-easy-mailchimp-extender' ) ?>:</strong>
 							<select id="yikes-easy-mc-dashboard-change-list" class="widefat">
 								<?php
-									foreach( $list_data['data'] as $list ) {
-										?><option val="<?php echo $list['id']; ?>"><?php echo $list['name']; ?></option><?php
+									foreach ( $list_data[ 'data' ] as $list ) {
+										?><option val="<?php echo $list[ 'id' ]; ?>"><?php echo $list[ 'name' ]; ?></option><?php
 									}
 								?>
 							</select>
-							<p class="description"><?php _e( 'Select a list from the dropdown above. View statistics related to this list below.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+							<p class="description"><?php _e( 'Select a list from the dropdown above. View statistics related to this list below.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 					</section>
 					<!-- display stats here! -->
 					<section id="yikes-easy-mc-dashboard-widget-stats">
 						<?php
-							if( !empty( $list_data['data'] ) ) {
+							if ( ! empty( $list_data[ 'data' ] ) ) {
 								include_once( YIKES_MC_PATH . 'admin/partials/dashboard-widgets/templates/stats-list-template.php' );
 							}
 						?>
 					</section>
 				<?php } else { ?>
 					<section id="yikes-easy-mc-dashboard-widget-stats">
-						<p class="no-lists-error"><?php _e( "Whoops, you don't have any lists set up. Head over to MailChimp to set up lists." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+						<p class="no-lists-error"><?php _e( "Whoops, you don't have any lists set up. Head over to MailChimp to set up lists.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 					</section>
 				<?php }
 		}
@@ -124,7 +124,7 @@ 
 				if ( false === ( $account_activity = get_transient( 'yikes-easy-mailchimp-account-activity' ) ) ) {
 					$api_key = yikes_get_mc_api_key();
 					$dash_position = strpos( $api_key, '-' );
-					if( $dash_position !== false ) {
+					if ( $dash_position !== false ) {
 						$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/helper/chimp-chatter.json';
 					}
 					$account_activity = wp_remote_post( $api_endpoint, array(
@@ -135,18 +135,18 @@ 
 						'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 					) );
 					$account_activity = json_decode( wp_remote_retrieve_body( $account_activity ), true );
-					if( isset( $account_activity['error'] ) ) {
-						if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+					if ( isset( $account_activity[ 'error' ] ) ) {
+						if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 							require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 							$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-							$error_logging->yikes_easy_mailchimp_write_to_error_log( $account_activity['error'], __( "Get Account Activity" , 'yikes-inc-easy-mailchimp-extender' ), "Dashboard Activity Widget" );
+							$error_logging->yikes_easy_mailchimp_write_to_error_log( $account_activity[ 'error' ], __( "Get Account Activity", 'yikes-inc-easy-mailchimp-extender' ), "Dashboard Activity Widget" );
 						}
 					} else {
 						// set our transient for one hour
 						set_transient( 'yikes-easy-mailchimp-account-activity', $account_activity, 1 * HOUR_IN_SECONDS );
 					}
 				}
-				if( ! empty( $account_activity ) ) {
+				if ( ! empty( $account_activity ) ) {
 					include_once( YIKES_MC_PATH . 'admin/partials/dashboard-widgets/templates/account-activity-template.php' );
 				}
 		}

admin/partials/dashboard-widgets/templates/stats-list-template.php

Spacing +17 added lines, -17 removed lines

@@ -2,36 +2,36 @@
 /* The template file for displaying our stats in the Admin dashboard widget */
 ?>
 <section id="yikes-easy-mc-widget-stat-holder">
-	<h3><?php echo $list_data['data'][0]['name']; ?> <small><a href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-view-list&list-id=' . $list_data['data'][0]['id'] . '' ) ); ?>" title="<?php _e( 'view List' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'view list' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></h3>
+	<h3><?php echo $list_data[ 'data' ][ 0 ][ 'name' ]; ?> <small><a href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-view-list&list-id=' . $list_data[ 'data' ][ 0 ][ 'id' ] . '' ) ); ?>" title="<?php _e( 'view List', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'view list', 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></h3>
 	
 	<table class="yikes-easy-mc-stats-table">
 		<thead class="yikes-easy-mc-hidden">
 			<tr>
-				<th><?php _e( 'Subscribers' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-				<th><?php _e( 'Unsubscribed' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-				<th><?php _e( 'New Since Send' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>	
-				<th><?php _e( 'Avg. Sub. Rate' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+				<th><?php _e( 'Subscribers', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+				<th><?php _e( 'Unsubscribed', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+				<th><?php _e( 'New Since Send', 'yikes-inc-easy-mailchimp-extender' ); ?></th>	
+				<th><?php _e( 'Avg. Sub. Rate', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
 			</tr>
 		</thead>
 		<tbody>
 			<tr class="yikes-easy-mc-table-stats-tr yikes-easy-mc-table-stats-tr-first">
-				<td title="<?php _e( 'Number of active subscribers.' , 'yikes-inc-easy-mailchimp-extender' ); ?>">
-					<p class="yikes-easy-mc-dashboard-stat"><?php echo $list_data['data'][0]['stats']['member_count']; ?></p>
-						<p class="yikes-easy-mc-stat-list-label"><?php _e( 'subscribers' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+				<td title="<?php _e( 'Number of active subscribers.', 'yikes-inc-easy-mailchimp-extender' ); ?>">
+					<p class="yikes-easy-mc-dashboard-stat"><?php echo $list_data[ 'data' ][ 0 ][ 'stats' ][ 'member_count' ]; ?></p>
+						<p class="yikes-easy-mc-stat-list-label"><?php _e( 'subscribers', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 				</td>
-				<td title="<?php _e( 'Number of users who have unsusbscribed.' , 'yikes-inc-easy-mailchimp-extender' ); ?>">
-					<p class="yikes-easy-mc-dashboard-stat"><?php echo $list_data['data'][0]['stats']['unsubscribe_count']; ?></p>
-						<p class="yikes-easy-mc-stat-list-label"><?php _e( 'unsubscribed' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+				<td title="<?php _e( 'Number of users who have unsusbscribed.', 'yikes-inc-easy-mailchimp-extender' ); ?>">
+					<p class="yikes-easy-mc-dashboard-stat"><?php echo $list_data[ 'data' ][ 0 ][ 'stats' ][ 'unsubscribe_count' ]; ?></p>
+						<p class="yikes-easy-mc-stat-list-label"><?php _e( 'unsubscribed', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 				</td>
 			</tr>
 			<tr class="yikes-easy-mc-table-stats-tr  yikes-easy-mc-table-stats-tr-second">
-				<td title="<?php _e( 'Number of new subscribers since the last campaign was sent.' , 'yikes-inc-easy-mailchimp-extender' ); ?>">
-					<p class="yikes-easy-mc-dashboard-stat"><?php echo $list_data['data'][0]['stats']['member_count_since_send']; ?></p>
-						<p class="yikes-easy-mc-stat-list-label"><?php _e( 'new since send' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+				<td title="<?php _e( 'Number of new subscribers since the last campaign was sent.', 'yikes-inc-easy-mailchimp-extender' ); ?>">
+					<p class="yikes-easy-mc-dashboard-stat"><?php echo $list_data[ 'data' ][ 0 ][ 'stats' ][ 'member_count_since_send' ]; ?></p>
+						<p class="yikes-easy-mc-stat-list-label"><?php _e( 'new since send', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 				</td>
-				<td title="<?php _e( 'Average number of subscribers per month.' , 'yikes-inc-easy-mailchimp-extender' ); ?>">
-					<p class="yikes-easy-mc-dashboard-stat"><?php echo $list_data['data'][0]['stats']['avg_sub_rate']; ?></p>
-						<p class="yikes-easy-mc-stat-list-label"><?php _e( 'avg. sub. rate' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+				<td title="<?php _e( 'Average number of subscribers per month.', 'yikes-inc-easy-mailchimp-extender' ); ?>">
+					<p class="yikes-easy-mc-dashboard-stat"><?php echo $list_data[ 'data' ][ 0 ][ 'stats' ][ 'avg_sub_rate' ]; ?></p>
+						<p class="yikes-easy-mc-stat-list-label"><?php _e( 'avg. sub. rate', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 				</td>
 			</tr>
 		</tbody>

admin/partials/dashboard-widgets/templates/account-activity-template.php

Spacing +11 added lines, -11 removed lines

@@ -8,23 +8,23 @@
 	</tr>
 	<?php 
 	$i = 1;
-	foreach( $account_activity as $activity ) {
-		if( $i <= 8 ) {
-		$message = $activity['message'];
-		$split_message = explode( ' - ' , $activity['message'] );
-		$split_list = explode( '"' , $split_message[0] );
-		if( isset( $split_list[1] ) ) {
-			if( isset( $activity['list_id'] ) ) {
-				$message = $split_list[0] . ' <a href="' . esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-view-list&list-id=' . $activity['list_id'] ) ) . '"><strong>' . $split_list[1] . '</strong></a>'; 
+	foreach ( $account_activity as $activity ) {
+		if ( $i <= 8 ) {
+		$message = $activity[ 'message' ];
+		$split_message = explode( ' - ', $activity[ 'message' ] );
+		$split_list = explode( '"', $split_message[ 0 ] );
+		if ( isset( $split_list[ 1 ] ) ) {
+			if ( isset( $activity[ 'list_id' ] ) ) {
+				$message = $split_list[ 0 ] . ' <a href="' . esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-view-list&list-id=' . $activity[ 'list_id' ] ) ) . '"><strong>' . $split_list[ 1 ] . '</strong></a>'; 
 			} else {
-				$message = $split_list[0] . ' <strong>' . $split_list[1] . '</strong>'; 
+				$message = $split_list[ 0 ] . ' <strong>' . $split_list[ 1 ] . '</strong>'; 
 			}
 		} else {
-			$message = $split_list[0];
+			$message = $split_list[ 0 ];
 		}
 		?>
 			<tr valign="top">
-				<td><label for="tablecell"><?php echo ucwords( str_replace( '-' , ' ' , str_replace( 'lists:' , '' , $activity['type'] ) ) ); ?></label></td>
+				<td><label for="tablecell"><?php echo ucwords( str_replace( '-', ' ', str_replace( 'lists:', '', $activity[ 'type' ] ) ) ); ?></label></td>
 				<td><?php echo $message; ?></td>
 			</tr>
 		<?php 

admin/partials/welcome-page/welcome-sections/whats-new-section.php

Spacing +9 added lines, -9 removed lines

@@ -2,7 +2,7 @@ 
 	
 	<div class="feature-section">
 		
-		<h2><?php _e( 'All New Form Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
+		<h2><?php _e( 'All New Form Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
 		
 		<img src="<?php echo YIKES_MC_URL . 'includes/images/Welcome_Page/form-layout-option.jpg'; ?>" alt="<?php _e( 'New Form Settings', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-easy-mc-feature-image yikes-easy-mc-whats-new-section-image">
 		
@@ -26,9 +26,9 @@ 
 	
 	<div class="feature-section">
 		
-		<h2><?php _e( 'Translated & Localized' , 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
+		<h2><?php _e( 'Translated & Localized', 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
 		
-		<p style="float:left;width:55%;max-width:55%;"><?php _e( "YIKES Easy Forms for MailChimp was developed with our international users in mind. Not only will you find the plugin to be i18n ready, but you'll also find our datepickers to be localized for mm/dd/yyyy or dd/mm/yyyy formats. Everything is automatic and gets localized based on the language of your site. It's like magic!",  'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<p style="float:left;width:55%;max-width:55%;"><?php _e( "YIKES Easy Forms for MailChimp was developed with our international users in mind. Not only will you find the plugin to be i18n ready, but you'll also find our datepickers to be localized for mm/dd/yyyy or dd/mm/yyyy formats. Everything is automatic and gets localized based on the language of your site. It's like magic!", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 		
 		<img style="width:40%;max-width:400px;display:block;" src="<?php echo YIKES_MC_URL . 'includes/images/Welcome_Page/arabic-calendar.png'; ?>" alt="<?php _e( 'Localized Arabic Calendar', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-easy-mc-feature-image yikes-easy-mc-whats-new-section-image">
 
@@ -38,19 +38,19 @@ 
 	
 	<div class="feature-section">
 		
-		<h2><?php _e( 'Knowledge Base & GlotPress Support' , 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
+		<h2><?php _e( 'Knowledge Base & GlotPress Support', 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
 				
 		<img style="float:left;max-width:300px;margin-right:20px;margin-left:0 !important;" src="<?php echo YIKES_MC_URL . 'includes/images/Welcome_Page/glotpress-translation-percentage.png'; ?>" alt="<?php _e( 'GlotPress Localized Precentage', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-easy-mc-feature-image yikes-easy-mc-whats-new-section-image">
 
-		<p><?php _e( "Since the initial release of this Easy Forms for MailChimp by YIKES we've been tirelessly working on putting together a collection of help articles ranging from troubleshooting tips to customization options. We've also included a collection of code snippets from some of our most widely asked questions. Now you can access some of our most popular articles right from within the plugin.",  'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<p><?php _e( "Since the initial release of this Easy Forms for MailChimp by YIKES we've been tirelessly working on putting together a collection of help articles ranging from troubleshooting tips to customization options. We've also included a collection of code snippets from some of our most widely asked questions. Now you can access some of our most popular articles right from within the plugin.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 				
-		<p><h4><a href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-support#knowledge-base-articles' ) ); ?>" title="<?php _e( 'Support | Knowledge Base' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Support → Knowledge Base Articles', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h4></p>
+		<p><h4><a href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-support#knowledge-base-articles' ) ); ?>" title="<?php _e( 'Support | Knowledge Base', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Support → Knowledge Base Articles', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h4></p>
 		
 		<p>&nbsp;</p>
 		
 		<p><?php _e( "With a ton of help from the WordPress community, we've been able to support 7 international languages. We're always looking for additional translators, so if you are multi-lingual and can help translate things - hop into glotpress and help contribute to future development of this plugin.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 		
-		<p><h4><a href="<?php echo esc_url_raw( 'https://translate.wordpress.org/projects/wp-plugins/yikes-inc-easy-mailchimp-extender' ); ?>" target="_blank"title="<?php _e( 'Easy Forms for MailChimp | GlotPress' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'GlotPress', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h4></p>
+		<p><h4><a href="<?php echo esc_url_raw( 'https://translate.wordpress.org/projects/wp-plugins/yikes-inc-easy-mailchimp-extender' ); ?>" target="_blank"title="<?php _e( 'Easy Forms for MailChimp | GlotPress', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'GlotPress', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h4></p>
 
 		
 	</div>
@@ -59,11 +59,11 @@ 
 	
 	<div class="feature-section">
 		
-		<h2><?php _e( 'Intuitive Settings Page' , 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
+		<h2><?php _e( 'Intuitive Settings Page', 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
 		
 		<img src="<?php echo YIKES_MC_URL . 'includes/images/Welcome_Page/settings-page.png'; ?>" alt="<?php _e( 'Settings Page', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-easy-mc-feature-image yikes-easy-mc-whats-new-section-image">
 
-		<p style="float:left; padding-left:15px;margin-top:5px;"><?php _e( "We've re-laid out the settings page to allow for a more intuitive workflow. All of your settings are neatly tucked away in their respective setting tab.",  'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<p style="float:left; padding-left:15px;margin-top:5px;"><?php _e( "We've re-laid out the settings page to allow for a more intuitive workflow. All of your settings are neatly tucked away in their respective setting tab.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 		
 	</div>
 	

admin/partials/welcome-page/welcome-sections/credits-section.php

Spacing +24 added lines, -24 removed lines

@@ -3,8 +3,8 @@ 
 	if ( false === ( $contributors = get_transient( 'yikes-mailchimp-contributor-transient' ) ) ) {
 		// It wasn't there, so regenerate the data and save the transient
 		$contributors = wp_remote_get( 'https://api.github.com/repos/yikesinc/yikes-inc-easy-mailchimp-extender/contributors?per_page=100', array( 'timeout' => 120 ) );
-		$contributors = json_decode( $contributors['body'] , true );
-		set_transient( 'yikes-mailchimp-contributor-transient', $contributors, 60*60*12 );
+		$contributors = json_decode( $contributors[ 'body' ], true );
+		set_transient( 'yikes-mailchimp-contributor-transient', $contributors, 60 * 60 * 12 );
 	}
 	// get the YIKES Inc. MailChimp translators via the Github API
 	if ( false === ( $translators = get_transient( 'yikes-mailchimp-translators-transient' ) ) ) {
@@ -19,20 +19,20 @@ 
 		);	
 		// create an empty array to store with translator data to loop over
 		$translators = array();
-		foreach( $translator_usernames as $username => $language ) {
+		foreach ( $translator_usernames as $username => $language ) {
 			$translator_data = wp_remote_get( 'https://api.github.com/users/' . $username, array( 'timeout' => 120 ) );
 			// if( $translator_data['status'] == 200 ) {
-				$translators_data_decoded = json_decode( $translator_data['body'] , true );
-				$translators[] = array(
-					'login' => $translators_data_decoded['login'],
-					'avatar_url' => $translators_data_decoded['avatar_url'],
-					'html_url' => $translators_data_decoded['html_url'],
-					'name' => $translators_data_decoded['name'],
+				$translators_data_decoded = json_decode( $translator_data[ 'body' ], true );
+				$translators[ ] = array(
+					'login' => $translators_data_decoded[ 'login' ],
+					'avatar_url' => $translators_data_decoded[ 'avatar_url' ],
+					'html_url' => $translators_data_decoded[ 'html_url' ],
+					'name' => $translators_data_decoded[ 'name' ],
 					'translation_language' => $language,
 				);
 			// }
 		}		
-		set_transient( 'yikes-mailchimp-translators-transient', $translators, 60*60*12 );
+		set_transient( 'yikes-mailchimp-translators-transient', $translators, 60 * 60 * 12 );
 	}
 ?>
 <div class="wrap about-wrap">
@@ -46,17 +46,17 @@ 
 		<div id="credit-container">
 			<h2><?php _e( 'Developers', 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
 			<?php
-				if( ! empty( $contributors ) ) {
-					$old_contributors = array( 'seriouslysean' , 'Apfelbiss', 'hiwhatsup', 'mialevesque' );
-						foreach( $contributors as $contributor ) {
+				if ( ! empty( $contributors ) ) {
+					$old_contributors = array( 'seriouslysean', 'Apfelbiss', 'hiwhatsup', 'mialevesque' );
+						foreach ( $contributors as $contributor ) {
 							// skip contributors from our old plugin (this is a new re-write)
-							if( ! in_array( $contributor['login'] , $old_contributors ) ) {
+							if ( ! in_array( $contributor[ 'login' ], $old_contributors ) ) {
 								?>
-								<a href="<?php echo esc_url_raw( $contributor['html_url'] ); ?>" title="<?php echo $contributor['login']; ?>" target="_blank" class="github-avatar-url">
+								<a href="<?php echo esc_url_raw( $contributor[ 'html_url' ] ); ?>" title="<?php echo $contributor[ 'login' ]; ?>" target="_blank" class="github-avatar-url">
 									<div class="team-member">
-										<img src="<?php echo esc_url_raw( $contributor['avatar_url'] ); ?>" class="github-avatar-image">
+										<img src="<?php echo esc_url_raw( $contributor[ 'avatar_url' ] ); ?>" class="github-avatar-image">
 										<p class="member-blurb">
-											<p><strong><?php echo $contributor['login']; ?></strong></p>
+											<p><strong><?php echo $contributor[ 'login' ]; ?></strong></p>
 										</p>
 									</div>
 								</a>
@@ -65,24 +65,24 @@ 
 						}
 				} else {
 					?>
-						<h4><?php _e( 'There was an error retrieving the contributors list. Please try again later.' , 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
+						<h4><?php _e( 'There was an error retrieving the contributors list. Please try again later.', 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
 					<?php
 				}
 			?>
 		</div>
 		
-		<?php if( ! empty( $translators ) ) { ?>
+		<?php if ( ! empty( $translators ) ) { ?>
 			<div id="translators-container">
 				<h2><?php _e( 'Translators', 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
 				<?php
-					foreach( $translators as $translator ) {
+					foreach ( $translators as $translator ) {
 						?>
-							<a href="<?php echo esc_url_raw( $translator['html_url'] ); ?>" title="<?php echo $translator['name']; ?>" target="_blank" class="github-avatar-url">
+							<a href="<?php echo esc_url_raw( $translator[ 'html_url' ] ); ?>" title="<?php echo $translator[ 'name' ]; ?>" target="_blank" class="github-avatar-url">
 								<div class="translator">
-									<img src="<?php echo esc_url_raw( $translator['avatar_url'] ); ?>" class="github-avatar-image">
+									<img src="<?php echo esc_url_raw( $translator[ 'avatar_url' ] ); ?>" class="github-avatar-image">
 									<p class="member-blurb">
-										<p><strong><?php echo $translator['login']; ?></strong></p>
-										<em class="translation-language"><?php echo $translator['translation_language']; ?></em>
+										<p><strong><?php echo $translator[ 'login' ]; ?></strong></p>
+										<em class="translation-language"><?php echo $translator[ 'translation_language' ]; ?></em>
 									</p>
 								</div>
 							</a>

admin/partials/welcome-page/welcome-sections/getting-started-section.php

Spacing +23 added lines, -23 removed lines

@@ -1,24 +1,24 @@ 
-<?php if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) == 'invalid_api_key' ) { ?>
+<?php if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) { ?>
 	<div class="about-description">
-		<?php printf( __( "Before you can create any opt-in forms, you'll first need to enter your MailChimp API key into the <a href='%s' title='Yikes Easy MailChimp Settings'>settings page</a>" , 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=general-settings' ) ) ); ?>
+		<?php printf( __( "Before you can create any opt-in forms, you'll first need to enter your MailChimp API key into the <a href='%s' title='Yikes Easy MailChimp Settings'>settings page</a>", 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=general-settings' ) ) ); ?>
 	</div>
 <?php } ?>
 
 <div class="changelog">
 		
-	<h3><?php _e( 'Creating Your First Opt-In Form' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
+	<h3><?php _e( 'Creating Your First Opt-In Form', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
 	
 	<div class="feature-section">
 		
 		<img src="<?php echo YIKES_MC_URL . 'includes/images/Welcome_Page/create-first-optin-form.jpg'; ?>" alt="<?php _e( 'Create first optin form screenshot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-easy-mc-feature-image">
 					
-		<h4><a href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ); ?>" title="<?php _e( 'Manage Forms' , 'yikes-inc-easy-mailchimp-extender' ); ?>">Easy MailChimp → <?php _e( 'Forms', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h4>
-		<p><?php _e( "Before you can start collecting users email addresses and building your mailing list, you'll need to create your first form. You can create as many forms as you'd like and assign each form to the same or different mailing lists.",  'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<h4><a href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ); ?>" title="<?php _e( 'Manage Forms', 'yikes-inc-easy-mailchimp-extender' ); ?>">Easy MailChimp → <?php _e( 'Forms', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h4>
+		<p><?php _e( "Before you can start collecting users email addresses and building your mailing list, you'll need to create your first form. You can create as many forms as you'd like and assign each form to the same or different mailing lists.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 	
 		<p>&nbsp;</p>
 		
-		<h4><?php _e( 'Additional Options' , 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
-		<p><?php _e( "Once you create a form, you can choose which fields you want to add to it and customize the success and error messages returned by MailChimp.",  'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<h4><?php _e( 'Additional Options', 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
+		<p><?php _e( "Once you create a form, you can choose which fields you want to add to it and customize the success and error messages returned by MailChimp.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 		
 	</div>
 	
@@ -26,41 +26,41 @@ 
 		
 		<img src="<?php echo YIKES_MC_URL . 'includes/images/Welcome_Page/optin-settings.png'; ?>" alt="<?php _e( 'Optin settings screenshot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-easy-mc-feature-image yikes-easy-mc-feature-image-left">
 					
-		<h4><?php _e( 'Customize the Form' , 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
-		<p><?php _e( "Once created, you can customize the form. This includes editing the success and error messages displayed to the user, choosing which fields or interest groups are displayed, adding CSS classes to fields, assigning default values amp; placeholders and tons more!",  'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<h4><?php _e( 'Customize the Form', 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
+		<p><?php _e( "Once created, you can customize the form. This includes editing the success and error messages displayed to the user, choosing which fields or interest groups are displayed, adding CSS classes to fields, assigning default values amp; placeholders and tons more!", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 		
 		<p>&nbsp;</p>
 		
-		<p><?php _e( "Quickly and easily switch which list the form is associated with, toggle single or double optin, whether the welcome email should be sent, toggle AJAX form submissions and more. Get customizing!",  'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<p><?php _e( "Quickly and easily switch which list the form is associated with, toggle single or double optin, whether the welcome email should be sent, toggle AJAX form submissions and more. Get customizing!", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 	</div>
 	<div class="feature-section">
 		
 		<img src="<?php echo YIKES_MC_URL . 'includes/images/Welcome_Page/add-field-to-page.png'; ?>" alt="<?php _e( 'Add field to form screenshot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-easy-mc-feature-image">
 					
-		<h4><?php _e( 'Add Form to Page/Post' , 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
-		<p><?php _e( "When you're ready to add your MailChimp opt-in form to a page or post, you can click on the small MailChimp button in the content editor toolbar.",  'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<h4><?php _e( 'Add Form to Page/Post', 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
+		<p><?php _e( "When you're ready to add your MailChimp opt-in form to a page or post, you can click on the small MailChimp button in the content editor toolbar.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 		
 		<p>&nbsp;</p>
 		
-		<h4><?php _e( 'Add Form to Widget' , 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
-		<p><?php _e( "We've created a MailChimp widget to easily add forms to any sidebar or widgetized area on your site. The widget allows you to select from any created forms.",  'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<h4><?php _e( 'Add Form to Widget', 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
+		<p><?php _e( "We've created a MailChimp widget to easily add forms to any sidebar or widgetized area on your site. The widget allows you to select from any created forms.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 	</div>
 	
 	<div class="feature-section">
-		<h3><span class="dashicons dashicons-format-status need-support-icon"></span> <?php _e( "Need Support?" , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>		
+		<h3><span class="dashicons dashicons-format-status need-support-icon"></span> <?php _e( "Need Support?", 'yikes-inc-easy-mailchimp-extender' ); ?></h3>		
 		
-		<h4><?php _e( 'Free Support' , 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
-		<p><?php _e( "If you need help using the free version of the plugin, you can post support inquiries to one of two locations.",  'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<h4><?php _e( 'Free Support', 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
+		<p><?php _e( "If you need help using the free version of the plugin, you can post support inquiries to one of two locations.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 		<ul class="support-option-list">
-			<li class="support-option support-option-first"><a href="https://wordpress.org/plugins/yikes-inc-easy-mailchimp-extender/" title="<?php esc_attr_e( 'WordPress Plugin Directory' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'WordPress Plugin Directory' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
-			<li class="support-option support-option-second"><a href="https://github.com/yikesinc/yikes-inc-easy-mailchimp-extender/issues" target="_blank" title="<?php esc_attr_e( 'GitHub Issue Tracker' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'GitHub Issue Tracker' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
+			<li class="support-option support-option-first"><a href="https://wordpress.org/plugins/yikes-inc-easy-mailchimp-extender/" title="<?php esc_attr_e( 'WordPress Plugin Directory', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'WordPress Plugin Directory', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
+			<li class="support-option support-option-second"><a href="https://github.com/yikesinc/yikes-inc-easy-mailchimp-extender/issues" target="_blank" title="<?php esc_attr_e( 'GitHub Issue Tracker', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'GitHub Issue Tracker', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
 		</ul>
 		
-		<h4><?php _e( 'Priority Support' , 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
-		<p><?php _e( "If you want immediate support, please consider purchasing an add-on or developer License. Not only will you get 1 full year of automatic updates and priority support, you will enjoy the tons of features packed into our add-ons that are not available in the free version." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<h4><?php _e( 'Priority Support', 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
+		<p><?php _e( "If you want immediate support, please consider purchasing an add-on or developer License. Not only will you get 1 full year of automatic updates and priority support, you will enjoy the tons of features packed into our add-ons that are not available in the free version.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
-		<h4><?php _e( 'Knowledge Base' , 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
-		<p><?php printf( __( 'For plugin documentation, visit our <a href="%s" title="Knowledge Base" target="_blank">knowledge base</a>.' , 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( 'https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/' ) ); ?>
+		<h4><?php _e( 'Knowledge Base', 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
+		<p><?php printf( __( 'For plugin documentation, visit our <a href="%s" title="Knowledge Base" target="_blank">knowledge base</a>.', 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( 'https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/' ) ); ?>
 		
 	</div>
 	

admin/partials/welcome-page/welcome.php

Spacing +12 added lines, -12 removed lines

@@ -7,22 +7,22 @@ 
 	 * @return void
 	 */
 	function yikes_easy_mc_welcome_tabs() {
-		$section = isset( $_GET['section'] ) ? $_GET['section'] : 'getting-started';
+		$section = isset( $_GET[ 'section' ] ) ? $_GET[ 'section' ] : 'getting-started';
 		?>
 		<h2 class="nav-tab-wrapper welcome-page-tabs">
-			<a class="nav-tab <?php echo $section == 'getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url_raw( admin_url( add_query_arg( array( 'page' => 'yikes-mailchimp-welcome' , 'section' => 'getting-started' ), 'admin.php' ) ) ); ?>">
+			<a class="nav-tab <?php echo $section == 'getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url_raw( admin_url( add_query_arg( array( 'page' => 'yikes-mailchimp-welcome', 'section' => 'getting-started' ), 'admin.php' ) ) ); ?>">
 				<span class="dashicons dashicons-admin-home"></span> <?php _e( 'Getting Started', 'yikes-inc-easy-mailchimp-extender' ); ?>
 			</a>
-			<a class="nav-tab <?php echo $section == 'whats-new' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url_raw( admin_url( add_query_arg( array( 'page' => 'yikes-mailchimp-welcome' , 'section' => 'whats-new' ), 'admin.php' ) ) ); ?>">
+			<a class="nav-tab <?php echo $section == 'whats-new' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url_raw( admin_url( add_query_arg( array( 'page' => 'yikes-mailchimp-welcome', 'section' => 'whats-new' ), 'admin.php' ) ) ); ?>">
 				<span class="dashicons dashicons-warning"></span> <?php _e( "What's New", 'yikes-inc-easy-mailchimp-extender' ); ?>
 			</a>
-			<a class="nav-tab <?php echo $section == 'add-ons' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url_raw( admin_url( add_query_arg( array( 'page' => 'yikes-mailchimp-welcome' , 'section' => 'add-ons' ), 'admin.php' ) ) ); ?>">
+			<a class="nav-tab <?php echo $section == 'add-ons' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url_raw( admin_url( add_query_arg( array( 'page' => 'yikes-mailchimp-welcome', 'section' => 'add-ons' ), 'admin.php' ) ) ); ?>">
 				<span class="dashicons dashicons-admin-plugins"></span> <?php _e( "Add-Ons", 'yikes-inc-easy-mailchimp-extender' ); ?>
 			</a>
-			<a class="nav-tab <?php echo $section == 'knowledge-base' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url_raw( admin_url( add_query_arg( array( 'page' => 'yikes-mailchimp-welcome' , 'section' => 'knowledge-base' ), 'admin.php' ) ) ); ?>">
+			<a class="nav-tab <?php echo $section == 'knowledge-base' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url_raw( admin_url( add_query_arg( array( 'page' => 'yikes-mailchimp-welcome', 'section' => 'knowledge-base' ), 'admin.php' ) ) ); ?>">
 				<span class="dashicons dashicons-welcome-learn-more"></span> <?php _e( 'Knowledge Base', 'yikes-inc-easy-mailchimp-extender' ); ?>
 			</a>
-			<a class="nav-tab <?php echo $section == 'credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url_raw( admin_url( add_query_arg( array( 'page' => 'yikes-mailchimp-welcome' , 'section' => 'credits' ), 'admin.php' ) ) ); ?>">
+			<a class="nav-tab <?php echo $section == 'credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url_raw( admin_url( add_query_arg( array( 'page' => 'yikes-mailchimp-welcome', 'section' => 'credits' ), 'admin.php' ) ) ); ?>">
 				<span class="dashicons dashicons-arrow-left-alt2"></span><?php _e( 'Credits', 'yikes-inc-easy-mailchimp-extender' ); ?><span class="dashicons dashicons-arrow-right-alt2"></span>
 			</a>
 		</h2>
@@ -30,8 +30,8 @@ 
 	}
 	
 	function yikes_easy_mc_welcome_body() {
-		$section = isset( $_GET['section'] ) ? $_GET['section'] : 'getting-started';
-		if( isset( $section ) ) {
+		$section = isset( $_GET[ 'section' ] ) ? $_GET[ 'section' ] : 'getting-started';
+		if ( isset( $section ) ) {
 			include_once( plugin_dir_path( dirname( __FILE__ ) ) . '/welcome-page/welcome-sections/' . $section . '-section.php' );
 		}
 	}
@@ -44,17 +44,17 @@ 
 		<div id="yikes-mailchimp-logo"></div>
 		
 		<h2 class="welcome-title">
-			Easy Forms for MailChimp by YIKES | <?php echo __( 'MailChimp Done Right' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+			Easy Forms for MailChimp by YIKES | <?php echo __( 'MailChimp Done Right', 'yikes-inc-easy-mailchimp-extender' ); ?>
 		</h2>		
 		
 		<p class="about-text">
 			<?php 
 				// check if this is a fresh install
-				if( get_option( 'yikes_easy_mailchimp_activation_date', strtotime( 'now' ) ) == strtotime( 'now' ) ) {
-					echo sprintf( __( 'Welcome to the most powerful MailChimp integration for WordPress. Easy Forms for MailChimp by YIKES v%s is ready to help take your mailing lists to the next level!' , 'yikes-inc-easy-mailchimp-extender' ) , $this->version ); 
+				if ( get_option( 'yikes_easy_mailchimp_activation_date', strtotime( 'now' ) ) == strtotime( 'now' ) ) {
+					echo sprintf( __( 'Welcome to the most powerful MailChimp integration for WordPress. Easy Forms for MailChimp by YIKES v%s is ready to help take your mailing lists to the next level!', 'yikes-inc-easy-mailchimp-extender' ), $this->version ); 
 				} else {
 					// else thank you for updating :)
-					echo sprintf( __( 'Thank you for updating to the latest version! Easy Forms for MailChimp by YIKES v%s is ready to help take your mailing lists to the next level!' , 'yikes-inc-easy-mailchimp-extender' ) , $this->version ); 
+					echo sprintf( __( 'Thank you for updating to the latest version! Easy Forms for MailChimp by YIKES v%s is ready to help take your mailing lists to the next level!', 'yikes-inc-easy-mailchimp-extender' ), $this->version ); 
 				}
 			?>
 		</p>

admin/partials/ajax/class.ajax.php

Indentation +9 added lines, -9 removed lines

@@ -154,17 +154,17 @@
 		public function findMCListIndex( $id, $array, $tag ) {
 			if( $tag == 'tag' ) {
 				foreach( $array as $key => $val ) {
-					   if ( $val['tag'] === $id ) {
-						   return $key;
-					   }
-				   }
-			   return null;
+						if ( $val['tag'] === $id ) {
+							return $key;
+						}
+					}
+				return null;
 			} else {
 				foreach ( $array as $key => $val ) {
-				   if ( $val['id'] == $id ) {
-					   return $key;
-				   }
-			   }
+					if ( $val['id'] == $id ) {
+						return $key;
+					}
+				}
 			return null;
 			}
 	  	} // end

Spacing +36 added lines, -36 removed lines

@@ -12,15 +12,15 @@ 
 
 		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 );
 		}
 
 		/*
@@ -28,7 +28,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();
@@ -39,10 +39,10 @@ 
 		// 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' ];
 			$api_key = yikes_get_mc_api_key();
 			$dash_position = strpos( $api_key, '-' );
-			if( $dash_position !== false ) {
+			if ( $dash_position !== false ) {
 				$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/list.json';
 			}
 			$list_data = wp_remote_post( $api_endpoint, array(
@@ -54,14 +54,14 @@ 
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
 			$list_data = json_decode( wp_remote_retrieve_body( $list_data ), true );
-			if( isset( $list_data['error'] ) ) {
-				if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+			if ( isset( $list_data[ 'error' ] ) ) {
+				if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 					require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 					$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-					$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data['error'], __( "Get Account Lists" , 'yikes-inc-easy-mailchimp-extender' ) , __( "MailChimp Widget" , 'yikes-inc-easy-mailchimp-extender' ) );
+					$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data[ 'error' ], __( "Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ), __( "MailChimp Widget", 'yikes-inc-easy-mailchimp-extender' ) );
 				}
 			}
-			if( ! empty( $list_data['data'][0] ) ) {
+			if ( ! empty( $list_data[ 'data' ][ 0 ] ) ) {
 				include_once( YIKES_MC_PATH . 'admin/partials/dashboard-widgets/templates/stats-list-template.php' );
 			}
 			exit();
@@ -73,19 +73,19 @@ 
 		// we want to return the interest groups associated with this list,
 		// to allow users to pre-check anything they want to assign users appropriately
 		/* 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'];
+		public static function check_list_for_interest_groups( $list_id = '', $integration_type = '', $load = false ) {
+			if ( ! $list_id ) {
+				$list_id = $_POST[ 'list_id' ];
 			}
-			if( ! $integration_type ) {
-				$integration_type = $_POST['integration'];
+			if ( ! $integration_type ) {
+				$integration_type = $_POST[ 'integration' ];
 			}
 			$api_key = yikes_get_mc_api_key();
 			// setup/check our transients
-			if ( WP_DEBUG ||  false === ( $interest_groupings = get_transient( $list_id . '_interest_group' ) ) ) {
+			if ( WP_DEBUG || false === ( $interest_groupings = get_transient( $list_id . '_interest_group' ) ) ) {
 			  // It wasn't there, so regenerate the data and save the transient
 				$dash_position = strpos( $api_key, '-' );
-				if( $dash_position !== false ) {
+				if ( $dash_position !== false ) {
 					$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/interest-groupings.json';
 				}
 				$interest_groupings = wp_remote_post( $api_endpoint, array(
@@ -98,22 +98,22 @@ 
 					'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 				) );
 				$interest_groupings = json_decode( wp_remote_retrieve_body( $interest_groupings ), true );
-				if( isset( $interest_groupings['error'] ) ) {
-					if( get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+				if ( isset( $interest_groupings[ 'error' ] ) ) {
+					if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 						require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 						$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-						$error_logging->yikes_easy_mailchimp_write_to_error_log( $interest_groupings['error'], __( "Get Interest Groups" , 'yikes-inc-easy-mailchimp-extender' ), "class.ajax.php" );
+						$error_logging->yikes_easy_mailchimp_write_to_error_log( $interest_groupings[ 'error' ], __( "Get Interest Groups", 'yikes-inc-easy-mailchimp-extender' ), "class.ajax.php" );
 					}
 				} else {
 					// set the transient for 2 hours
 					set_transient( $list_id . '_interest_group', $interest_groupings, 2 * HOUR_IN_SECONDS );
 				}
 			}
-			if( isset( $interest_groupings ) && ! empty( $interest_groupings ) ) {
+			if ( isset( $interest_groupings ) && ! empty( $interest_groupings ) ) {
 				require( YIKES_MC_PATH . 'admin/partials/menu/options-sections/templates/integration-interest-groups.php' );
 			}
 			// do not kill off execution on load, only on an ajax request
-			if( ! $load ) {
+			if ( ! $load ) {
 				exit();
 				wp_die();
 			}
@@ -123,10 +123,10 @@ 
 		// send a field to our form
 		public function send_field_to_form() {
 			$form_data_array = array(
-				'field_name' => $_POST['field_name'],
-				'merge_tag' => $_POST['merge_tag'],
-				'field_type' => $_POST['field_type'],
-				'list_id' => $_POST['list_id'],
+				'field_name' => $_POST[ 'field_name' ],
+				'merge_tag' => $_POST[ 'merge_tag' ],
+				'field_type' => $_POST[ 'field_type' ],
+				'list_id' => $_POST[ 'list_id' ],
 			);
 			include YIKES_MC_PATH . 'admin/partials/ajax/add_field_to_form.php';
 			exit();
@@ -136,10 +136,10 @@ 
 		// send interest group to our form
 		public function send_interest_group_to_form() {
 			$form_data_array = array(
-				'field_name' => $_POST['field_name'],
-				'group_id' => $_POST['group_id'],
-				'field_type' => $_POST['field_type'],
-				'list_id' => $_POST['list_id'],
+				'field_name' => $_POST[ 'field_name' ],
+				'group_id' => $_POST[ 'group_id' ],
+				'field_type' => $_POST[ 'field_type' ],
+				'list_id' => $_POST[ 'list_id' ],
 			);
 			include YIKES_MC_PATH . 'admin/partials/ajax/add_interest_group_to_form.php';
 			exit();
@@ -152,16 +152,16 @@ 
 		*	- http://stackoverflow.com/questions/6661530/php-multi-dimensional-array-search
 		*/
 		public function findMCListIndex( $id, $array, $tag ) {
-			if( $tag == 'tag' ) {
-				foreach( $array as $key => $val ) {
-					   if ( $val['tag'] === $id ) {
+			if ( $tag == 'tag' ) {
+				foreach ( $array as $key => $val ) {
+					   if ( $val[ 'tag' ] === $id ) {
 						   return $key;
 					   }
 				   }
 			   return null;
 			} else {
 				foreach ( $array as $key => $val ) {
-				   if ( $val['id'] == $id ) {
+				   if ( $val[ 'id' ] == $id ) {
 					   return $key;
 				   }
 			   }

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' ) ) { ?>
-				<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>