yikesinc / yikes-inc-easy-mailchimp-extender

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

Spacing +46 added lines, -46 removed lines

@@ -11,8 +11,8 @@ 
 */
 
 	// enqueue jquery qtip for our tooltip
-	wp_enqueue_script( 'jquery-qtip-tooltip', YIKES_MC_URL . 'admin/js/min/jquery.qtip.min.js' , array( 'jquery' ) );
-	wp_enqueue_style( 'jquery-qtip-style',  YIKES_MC_URL . 'admin/css/jquery.qtip.min.css' );
+	wp_enqueue_script( 'jquery-qtip-tooltip', YIKES_MC_URL . 'admin/js/min/jquery.qtip.min.js', array( 'jquery' ) );
+	wp_enqueue_style( 'jquery-qtip-style', YIKES_MC_URL . 'admin/css/jquery.qtip.min.css' );
 
 	?>
 	<script>
@@ -43,40 +43,40 @@ 
 	);
 
 	$class_descriptions = array(
-		'comment_form' => '<img class="tooltip-integration-banner" src="' . YIKES_MC_URL . 'includes/images/Checkbox_Integration_Logos/wordpress-banner-logo.png" title="' . __( 'WordPress' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Enabling the WordPress core comment form opt-in checkbox will display a checkbox to your current users when leaving a comment (if they are not currently subscribed).' , 'yikes-inc-easy-mailchimp-extender' ),
-		'registration_form' => '<img class="tooltip-integration-banner" src="' . YIKES_MC_URL . 'includes/images/Checkbox_Integration_Logos/wordpress-banner-logo.png" title="' . __( 'WordPress' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Enabling the WordPress core registration form opt-in checkbox will display a checkbox to new users when registering for your site.' , 'yikes-inc-easy-mailchimp-extender' ),
-		'woocommerce_checkout_form' => '<img class="tooltip-integration-banner" src="' . YIKES_MC_URL . 'includes/images/Checkbox_Integration_Logos/woocommerce-banner.png" title="' . __( 'WooCommerce Store' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Enabling the WooCommerce checkout opt-in form allows you to capture email addresses from users who make purchases in your store. This option will add an opt-in checkbox to the checkout page.' , 'yikes-inc-easy-mailchimp-extender' ),
-		'easy_digital_downloads_checkout_form' => '<img class="tooltip-integration-banner" src="' . YIKES_MC_URL . 'includes/images/Checkbox_Integration_Logos/edd-banner.png" title="' . __( 'Easy Digital Downloads' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Enabling the Easy Digital Downloads checkout opt-in allows users who make a purchase to opt-in to your mailing list during checkout.' , 'yikes-inc-easy-mailchimp-extender' ),
-		'buddypress_form' => '<img class="tooltip-integration-banner" src="' . YIKES_MC_URL . 'includes/images/Checkbox_Integration_Logos/buddypress-banner.png" title="' . __( 'BuddyPress' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Enabling the BuddyPress opt-in allows users who register for your site to be automatically added to the mailing list of your choice.' , 'yikes-inc-easy-mailchimp-extender' ),
-		'bbpress_forms' => '<img class="tooltip-integration-banner" src="' . YIKES_MC_URL . 'includes/images/Checkbox_Integration_Logos/bbpress-banner.png" title="' . __( 'bbPress' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Enabling the bbPress opt-in enables users who register to use the forums on your site to be automatically added to the mailing list of your choice.' , 'yikes-inc-easy-mailchimp-extender' ),
-		'contact_form_7' => '<img class="tooltip-integration-banner" src="' . YIKES_MC_URL . 'includes/images/Checkbox_Integration_Logos/cf7-banner.png" title="' . __( 'Contact Form 7' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Once the Contact Form 7 integration is active you can use our custom shortcode [yikes_mailchimp_checkbox] in your contact forms to subscribe users to a pre-selected list.' , 'yikes-inc-easy-mailchimp-extender' ),
+		'comment_form' => '<img class="tooltip-integration-banner" src="' . YIKES_MC_URL . 'includes/images/Checkbox_Integration_Logos/wordpress-banner-logo.png" title="' . __( 'WordPress', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Enabling the WordPress core comment form opt-in checkbox will display a checkbox to your current users when leaving a comment (if they are not currently subscribed).', 'yikes-inc-easy-mailchimp-extender' ),
+		'registration_form' => '<img class="tooltip-integration-banner" src="' . YIKES_MC_URL . 'includes/images/Checkbox_Integration_Logos/wordpress-banner-logo.png" title="' . __( 'WordPress', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Enabling the WordPress core registration form opt-in checkbox will display a checkbox to new users when registering for your site.', 'yikes-inc-easy-mailchimp-extender' ),
+		'woocommerce_checkout_form' => '<img class="tooltip-integration-banner" src="' . YIKES_MC_URL . 'includes/images/Checkbox_Integration_Logos/woocommerce-banner.png" title="' . __( 'WooCommerce Store', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Enabling the WooCommerce checkout opt-in form allows you to capture email addresses from users who make purchases in your store. This option will add an opt-in checkbox to the checkout page.', 'yikes-inc-easy-mailchimp-extender' ),
+		'easy_digital_downloads_checkout_form' => '<img class="tooltip-integration-banner" src="' . YIKES_MC_URL . 'includes/images/Checkbox_Integration_Logos/edd-banner.png" title="' . __( 'Easy Digital Downloads', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Enabling the Easy Digital Downloads checkout opt-in allows users who make a purchase to opt-in to your mailing list during checkout.', 'yikes-inc-easy-mailchimp-extender' ),
+		'buddypress_form' => '<img class="tooltip-integration-banner" src="' . YIKES_MC_URL . 'includes/images/Checkbox_Integration_Logos/buddypress-banner.png" title="' . __( 'BuddyPress', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Enabling the BuddyPress opt-in allows users who register for your site to be automatically added to the mailing list of your choice.', 'yikes-inc-easy-mailchimp-extender' ),
+		'bbpress_forms' => '<img class="tooltip-integration-banner" src="' . YIKES_MC_URL . 'includes/images/Checkbox_Integration_Logos/bbpress-banner.png" title="' . __( 'bbPress', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Enabling the bbPress opt-in enables users who register to use the forums on your site to be automatically added to the mailing list of your choice.', 'yikes-inc-easy-mailchimp-extender' ),
+		'contact_form_7' => '<img class="tooltip-integration-banner" src="' . YIKES_MC_URL . 'includes/images/Checkbox_Integration_Logos/cf7-banner.png" title="' . __( 'Contact Form 7', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Once the Contact Form 7 integration is active you can use our custom shortcode [yikes_mailchimp_checkbox] in your contact forms to subscribe users to a pre-selected list.', 'yikes-inc-easy-mailchimp-extender' ),
 	);
 
 	// Easy Digital Downloads
-	if( class_exists( 'Easy_Digital_Downloads' ) ) {
-		$active_plugins['easy_digital_downloads_checkout_form'] = __( 'Easy Digital Downloads Checkout', 'yikes-inc-easy-mailchimp-extender' );
+	if ( class_exists( 'Easy_Digital_Downloads' ) ) {
+		$active_plugins[ 'easy_digital_downloads_checkout_form' ] = __( 'Easy Digital Downloads Checkout', 'yikes-inc-easy-mailchimp-extender' );
 	}
 	// WooCommerce
-	if( class_exists( 'WooCommerce' ) ) {
-		$active_plugins['woocommerce_checkout_form'] = __( 'WooCommerce Checkout', 'yikes-inc-easy-mailchimp-extender' );
+	if ( class_exists( 'WooCommerce' ) ) {
+		$active_plugins[ 'woocommerce_checkout_form' ] = __( 'WooCommerce Checkout', 'yikes-inc-easy-mailchimp-extender' );
 	}
 	// BuddyPress
-	if( class_exists( 'BuddyPress' ) ) {
-		$active_plugins['buddypress_form'] = __( 'BuddyPress Registration', 'yikes-inc-easy-mailchimp-extender' );
+	if ( class_exists( 'BuddyPress' ) ) {
+		$active_plugins[ 'buddypress_form' ] = __( 'BuddyPress Registration', 'yikes-inc-easy-mailchimp-extender' );
 	}
 	// bbPress
-	if( class_exists( 'bbPress' ) ) {
-		$active_plugins['bbpress_forms'] = __( 'bbPress', 'yikes-inc-easy-mailchimp-extender' );
+	if ( class_exists( 'bbPress' ) ) {
+		$active_plugins[ 'bbpress_forms' ] = __( 'bbPress', 'yikes-inc-easy-mailchimp-extender' );
 	}
 	// Contact Form 7
-	if( is_plugin_active( 'contact-form-7/wp-contact-form-7.php' ) ) {
-		$active_plugins['contact_form_7'] = __( 'Contact Form 7', 'yikes-inc-easy-mailchimp-extender' );
+	if ( is_plugin_active( 'contact-form-7/wp-contact-form-7.php' ) ) {
+		$active_plugins[ 'contact_form_7' ] = __( 'Contact Form 7', 'yikes-inc-easy-mailchimp-extender' );
 	}
 
 	// store our checkbox options
-	$options = get_option( 'optin-checkbox-init' , '' );
+	$options = get_option( 'optin-checkbox-init', '' );
 ?>
-<h3><span><?php _e( 'Integration Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
+<h3><span><?php _e( 'Integration Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
 
 
 	<?php
@@ -87,7 +87,7 @@ 
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
 			$error_logging->maybe_write_to_log(
 				$list_data->get_error_code(),
-				__( "Get Account Lists" , 'yikes-inc-easy-mailchimp-extender' ),
+				__( "Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ),
 				"Integration Settings Page"
 			);
 		}
@@ -95,7 +95,7 @@ 
 		?>
 		<div class="inside">
 			<?php
-				echo sprintf( __( 'Please %s to setup your integrations.', 'yikes-inc-easy-mailchimp-extender' ), '<a href="' . esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=general-settings' ) ) . '" title="' . __( 'General Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'enter a valid MailChimp API key' , 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );
+				echo sprintf( __( 'Please %s to setup your integrations.', 'yikes-inc-easy-mailchimp-extender' ), '<a href="' . esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=general-settings' ) ) . '" title="' . __( 'General Settings', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'enter a valid MailChimp API key', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );
 			?>
 		</div>
 		<?php
@@ -106,7 +106,7 @@ 
 <div class="inside">
 
 	<p>
-		<?php _e( 'Select which plugins or features Easy Forms for MailChimp by Yikes Inc. should integrate with. Depending on which plugins or features you choose to integrate with, an opt-in checkbox will be generated. For example, the comment form checkbox will generate a checkbox below the standard WordPress comment form to add any new commenters to a pre-determined MailChimp mailing list.' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+		<?php _e( 'Select which plugins or features Easy Forms for MailChimp by Yikes Inc. should integrate with. Depending on which plugins or features you choose to integrate with, an opt-in checkbox will be generated. For example, the comment form checkbox will generate a checkbox below the standard WordPress comment form to add any new commenters to a pre-determined MailChimp mailing list.', 'yikes-inc-easy-mailchimp-extender' ); ?>
 	</p>
 
 	<!-- Settings Form -->
@@ -116,30 +116,30 @@ 
 
 	<ul>
 		<?php
-			if( !empty( $active_plugins ) ) {
+			if ( ! empty( $active_plugins ) ) {
 
-				foreach( $active_plugins as $class => $value ) {
+				foreach ( $active_plugins as $class => $value ) {
 					// echo  $class;
-					$checked = isset( $options[$class]['value'] ) ? 'checked="checked"' : '';
-					$hidden =  !isset( $options[$class]['value'] ) ? 'yikes-easy-mc-hidden' : '';
-					$checkbox_label = isset( $options[$class]['label'] ) ? esc_attr__( $options[$class]['label'] ) : '';
-					$precheck_checkbox = isset( $options[$class]['precheck'] ) ? $options[$class]['precheck'] : '';
-					$selected_list = isset( $options[$class]['associated-list'] ) ? $options[$class]['associated-list'] : '-';
-					$list_interest_groups = isset( $options[$class]['interest-groups'] ) ? $options[$class]['interest-groups'] : false;
+					$checked = isset( $options[ $class ][ 'value' ] ) ? 'checked="checked"' : '';
+					$hidden = ! isset( $options[ $class ][ 'value' ] ) ? 'yikes-easy-mc-hidden' : '';
+					$checkbox_label = isset( $options[ $class ][ 'label' ] ) ? esc_attr__( $options[ $class ][ 'label' ] ) : '';
+					$precheck_checkbox = isset( $options[ $class ][ 'precheck' ] ) ? $options[ $class ][ 'precheck' ] : '';
+					$selected_list = isset( $options[ $class ][ 'associated-list' ] ) ? $options[ $class ][ 'associated-list' ] : '-';
+					$list_interest_groups = isset( $options[ $class ][ 'interest-groups' ] ) ? $options[ $class ][ 'interest-groups' ] : false;
 					?>
 						<li>
 							<label>
-								<input type="checkbox" name="optin-checkbox-init[<?php echo $class; ?>][value]" value="on" <?php echo $checked; ?> onclick="jQuery(this).parents('li').next().stop().slideToggle();"><?php echo ucwords( $value ); ?><span class="dashicons dashicons-editor-help"></span><div class="tooltiptext qtip-bootstrap" style="display:none;"><?php echo $class_descriptions[$class]; ?></div>
+								<input type="checkbox" name="optin-checkbox-init[<?php echo $class; ?>][value]" value="on" <?php echo $checked; ?> onclick="jQuery(this).parents('li').next().stop().slideToggle();"><?php echo ucwords( $value ); ?><span class="dashicons dashicons-editor-help"></span><div class="tooltiptext qtip-bootstrap" style="display:none;"><?php echo $class_descriptions[ $class ]; ?></div>
 							</label>
 						</li>
 						<!-- checkbox settings, text - associated list etc. -->
 						<li class="optin-checkbox-init[<?php echo $class; ?>]-settings <?php echo $hidden; ?>">
-							<?php if( $class == 'contact_form_7' ) { ?>
+							<?php if ( $class == 'contact_form_7' ) { ?>
 								<p style="margin-top:0;"><small class="contact-form-7-notice"><?php printf( __( 'Use %s in Contact Form 7 to display the checkbox.', 'yikes-inc-easy-mailchimp-extender' ), '<code>[yikes_mailchimp_checkbox]</code>' ); ?></small></p>
 							<?php } ?>
 							<p style="margin-top:0;padding-top:0;margin-bottom:0;padding-bottom:0;">
 								<!-- checkbox associated list -->
-								<label><?php _e( 'Associated List' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<label><?php _e( 'Associated List', 'yikes-inc-easy-mailchimp-extender' ); ?>
 									<?php
 										if ( count( $list_data ) > 0 ) {
 											?>
@@ -147,26 +147,26 @@ 
 											        data-attr-integration="<?php echo $class; ?>"
 											        name="optin-checkbox-init[<?php echo $class; ?>][associated-list]"
 											        onchange="checkForInterestGroups( jQuery( this ), jQuery( this ).find( 'option:selected' ).val(), jQuery( this ).attr( 'data-attr-integration' ) );return false;">
-												<option value="-" <?php selected( $selected_list , '-' ); ?>><?php _e( 'Select a List' , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
-												<?php foreach( $list_data as $list ) { ?>
-													<option value="<?php echo $list['id']; ?>" <?php selected( $selected_list , $list['id'] ); ?>><?php echo $list['name']; ?></option>
+												<option value="-" <?php selected( $selected_list, '-' ); ?>><?php _e( 'Select a List', 'yikes-inc-easy-mailchimp-extender' ); ?></option>
+												<?php foreach ( $list_data as $list ) { ?>
+													<option value="<?php echo $list[ 'id' ]; ?>" <?php selected( $selected_list, $list[ 'id' ] ); ?>><?php echo $list[ 'name' ]; ?></option>
 												<?php } ?>
 											</select>
 											<?php
 										} else {
-											echo '<p class="description no-lists-setup-notice"><strong>' . __( 'You have not setup any lists. You should head over to MailChimp and setup your first list.' , 'yikes-inc-easy-mailchimp-extender' ) . '</strong></p>';
+											echo '<p class="description no-lists-setup-notice"><strong>' . __( 'You have not setup any lists. You should head over to MailChimp and setup your first list.', 'yikes-inc-easy-mailchimp-extender' ) . '</strong></p>';
 										}
 									?>
 								</label>
 								<!-- checkbox text label -->
-								<label><?php _e( 'Checkbox Label' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<label><?php _e( 'Checkbox Label', 'yikes-inc-easy-mailchimp-extender' ); ?>
 									<input type="text" class="optin-checkbox-init[<?php echo $class; ?>][label] optin-checkbox-label-input" name="optin-checkbox-init[<?php echo $class; ?>][label]" value="<?php echo $checkbox_label; ?>">
 								</label>
 								<!-- prechecked? -->
-								<label><?php _e( 'Precheck Checkbox' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<label><?php _e( 'Precheck Checkbox', 'yikes-inc-easy-mailchimp-extender' ); ?>
 									<select id="optin-checkbox-init[<?php echo $class; ?>][precheck]" name="optin-checkbox-init[<?php echo $class; ?>][precheck]" class="optin-checkbox-init[<?php echo $class; ?>][precheck] checkbox-settings-list-dropdown">
-										<option value="true" <?php selected( $precheck_checkbox , 'true' ); ?>><?php _e( 'Yes' , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
-										<option value="false" <?php selected( $precheck_checkbox , 'false' ); ?>><?php _e( 'No' , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
+										<option value="true" <?php selected( $precheck_checkbox, 'true' ); ?>><?php _e( 'Yes', 'yikes-inc-easy-mailchimp-extender' ); ?></option>
+										<option value="false" <?php selected( $precheck_checkbox, 'false' ); ?>><?php _e( 'No', 'yikes-inc-easy-mailchimp-extender' ); ?></option>
 									</select>
 								</label>
 
@@ -177,8 +177,8 @@ 
 											$interest_groupings = get_transient( $selected_list . '_interest_group' );
 											$integration_type = $class;
 											require( YIKES_MC_PATH . 'admin/partials/menu/options-sections/templates/integration-interest-groups.php' );
-										} else if( $selected_list != '-' && $list_interest_groups ) {
-											$list_id = $options[$class]['associated-list'];
+										} else if ( $selected_list != '-' && $list_interest_groups ) {
+											$list_id = $options[ $class ][ 'associated-list' ];
 											$integration_type = $class;
 											YIKES_Inc_Easy_MailChimp_Process_Ajax::check_list_for_interest_groups( $list_id, $integration_type, true );
 										}
@@ -193,7 +193,7 @@ 
 			} else {
 				?>
 					<li>
-						<?php _e( 'Nothing is active.' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+						<?php _e( 'Nothing is active.', 'yikes-inc-easy-mailchimp-extender' ); ?>
 					</li>
 				<?php
 			}

admin/partials/menu/options-sections/templates/integration-interest-groups.php

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-$integration_options = get_option( 'optin-checkbox-init' , '' );
+$integration_options = get_option( 'optin-checkbox-init', '' );
 
 ?>
 <br />
@@ -11,25 +11,25 @@ 
 /*
 *	Loop over interest groups
 */
-foreach( $interest_groupings as $id => $interest_group ) {
+foreach ( $interest_groupings as $id => $interest_group ) {
 
-	$interest_group_type      = isset( $interest_group['type'] ) ? $interest_group['type'] : '';
-	$interest_groups_fields   = isset( $interest_group['items'] ) ? $interest_group['items'] : array();
-	$selected_interest_groups = isset( $integration_options[ $integration_type ]['interest-groups'] ) ? $integration_options[ $integration_type ]['interest-groups'] : array();
+	$interest_group_type      = isset( $interest_group[ 'type' ] ) ? $interest_group[ 'type' ] : '';
+	$interest_groups_fields   = isset( $interest_group[ 'items' ] ) ? $interest_group[ 'items' ] : array();
+	$selected_interest_groups = isset( $integration_options[ $integration_type ][ 'interest-groups' ] ) ? $integration_options[ $integration_type ][ 'interest-groups' ] : array();
 	?>
 	<section class="interest-group-section">
-		<strong class="interest-group-section-title"><?php echo ucwords( $interest_group['title'] ); ?></strong>
+		<strong class="interest-group-section-title"><?php echo ucwords( $interest_group[ 'title' ] ); ?></strong>
 	<?php
 	/*
 	*	Loop over the interest group types, and return the appropriate type
 	*/
 	$checked = $selected = '';
-	switch( $interest_group_type ) {
+	switch ( $interest_group_type ) {
 	
 		default:
 		case 'hidden':
 		case 'checkboxes':
-			foreach( $interest_groups_fields as $field_id => $field ) {
+			foreach ( $interest_groups_fields as $field_id => $field ) {
 				if ( isset( $selected_interest_groups[ $id ] ) ) {
 					$checked = checked( true, in_array( $field_id, $selected_interest_groups[ $id ] ), false );
 				}
@@ -38,7 +38,7 @@ 
 					<input type="checkbox"
 					       name="optin-checkbox-init[<?php echo $integration_type; ?>][interest-groups][<?php echo $id; ?>][]"
 					       value="<?php echo $field_id; ?>" <?php echo $checked ?>>
-					<?php echo $field['name']; ?>
+					<?php echo $field[ 'name' ]; ?>
 				</label>
 				<?php
 			}
@@ -54,7 +54,7 @@ 
 					<input type="radio"
 					       name="optin-checkbox-init[<?php echo $integration_type; ?>][interest-groups][<?php echo $id; ?>][]"
 					       value="<?php echo $field_id; ?>" <?php echo $checked; ?>>
-					<?php echo $field['name']; ?>
+					<?php echo $field[ 'name' ]; ?>
 				</label>
 				<?php
 			}
@@ -65,13 +65,13 @@ 
 			if ( ! empty( $interest_groups_fields ) ) {
 				?>
 				<select name="optin-checkbox-init[<?php echo $integration_type; ?>][interest-groups][<?php echo $id; ?>][]">
-				<?php foreach( $interest_groups_fields as $field_id => $field ) {
+				<?php foreach ( $interest_groups_fields as $field_id => $field ) {
 					if ( isset( $selected_interest_groups[ $id ] ) ) {
 						$selected = checked( true, in_array( $field_id, $selected_interest_groups[ $id ] ), false );
 					}
 					?>
 					<option value="<?php echo $field_id; ?>" <?php echo $selected; ?>>
-						<?php echo $field['name']; ?>
+						<?php echo $field[ 'name' ]; ?>
 					</option>
 				<?php
 				}

admin/partials/menu/account-details.php

Spacing +42 added lines, -42 removed lines

@@ -48,11 +48,11 @@ 
 ?>
 <div class="wrap" id="account-details">
 	<!-- Freddie Logo -->
-	<img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - MailChimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
+	<img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - MailChimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
 
-	<h1><?php _e( 'Account Overview' , 'yikes-inc-easy-mailchimp-extender' ); echo ' | ' . $account_details['username']; ?></h1>
+	<h1><?php _e( 'Account Overview', 'yikes-inc-easy-mailchimp-extender' ); echo ' | ' . $account_details[ 'username' ]; ?></h1>
 	<!-- Account Overview Page Description -->
-	<p class="yikes-easy-mc-about-text about-text"><?php _e( "Below you'll find a brief overview of account activity as well as some account and profile info." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+	<p class="yikes-easy-mc-about-text about-text"><?php _e( "Below you'll find a brief overview of account activity as well as some account and profile info.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
 	<div id="poststuff">
 		<div id="post-body" class="metabox-holder columns-2">
@@ -62,17 +62,17 @@ 
 					<!-- <div class="postbox yikes-easy-mc-postbox" id="chimp-chatter">
 						<div class="inside"> -->
 
-							<h1><?php _e( 'Chimp Chatter' , 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
+							<h1><?php _e( 'Chimp Chatter', 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
 
 							<?php
 								$date_format = get_option( 'date_format' );
 								$time_format = get_option( 'time_format' );
 								$x = 1;
 								$end = count( $account_activity );
-								foreach( $account_activity as $activity ) {
-									$split_type = explode( ':',str_replace('-',' ',$activity['type']));
+								foreach ( $account_activity as $activity ) {
+									$split_type = explode( ':', str_replace( '-', ' ', $activity[ 'type' ] ) );
 									$section_class = '';
-									switch( $activity['type'] ) {
+									switch ( $activity[ 'type' ] ) {
 										case 'lists:new-subscriber':
 										case 'lists:profile-updates':
 										case 'campaigns:facebook-likes':
@@ -90,60 +90,60 @@ 
 											$section_class = 'chimp-chatter-neutral';
 											break;
 									}
-									if( $x < 5 ) {
+									if ( $x < 5 ) {
 									?>
 										<!--- <section class="chimp-chatter-container <?php echo esc_attr( $section_class ); ?>">
-											<div class="chatter-type"><?php echo ucwords( $split_type[1] ); ?></div>
+											<div class="chatter-type"><?php echo ucwords( $split_type[ 1 ] ); ?></div>
 											<p class="chatter-message description">
-												<?php echo $activity['message']; ?>
+												<?php echo $activity[ 'message' ]; ?>
 											</p>
 											<p class="chatter-time">
-												<?php echo get_date_from_gmt( $activity['update_time'], 'F jS, Y h:i a' ); ?>
+												<?php echo get_date_from_gmt( $activity[ 'update_time' ], 'F jS, Y h:i a' ); ?>
 											</p>
 										</section> -->
 
-										<section class="postbox yikes-easy-mc-postbox chimp-chatter-postbox <?php echo esc_attr( $section_class ); if( $x % 2 == 0 ) { echo ' even'; } ?>">
+										<section class="postbox yikes-easy-mc-postbox chimp-chatter-postbox <?php echo esc_attr( $section_class ); if ( $x % 2 == 0 ) { echo ' even'; } ?>">
 											<div class="inside">
-												<div class="chatter-type"><?php echo ucwords( $split_type[1] ); ?></div>
+												<div class="chatter-type"><?php echo ucwords( $split_type[ 1 ] ); ?></div>
 												<p class="chatter-message description">
-													<?php echo $activity['message']; ?>
+													<?php echo $activity[ 'message' ]; ?>
 												</p>
 												<p class="chatter-time">
-													<?php echo get_date_from_gmt( $activity['update_time'], 'F jS, Y h:i a' ); ?>
+													<?php echo get_date_from_gmt( $activity[ 'update_time' ], 'F jS, Y h:i a' ); ?>
 												</p>
 											</div>
 										</section>
 									<?php
 									} else {
-										if( $x == 7 ) {
+										if ( $x == 7 ) {
 											?>
 												<div id="hidden-chatter" class="yikes-easy-mc-hidden">
 											<?php
 										}
 										?>
 												<!-- <section class="chimp-chatter-container <?php echo esc_attr( $section_class ); ?>">
-													<div class="chatter-type"><?php echo ucwords( $split_type[1] ); ?></div>
+													<div class="chatter-type"><?php echo ucwords( $split_type[ 1 ] ); ?></div>
 													<p class="chatter-message description">
-														<?php echo $activity['message']; ?>
+														<?php echo $activity[ 'message' ]; ?>
 													</p>
 													<p class="chatter-time">
-														<?php echo get_date_from_gmt( $activity['update_time'], 'F jS, Y h:i a' ); ?>
+														<?php echo get_date_from_gmt( $activity[ 'update_time' ], 'F jS, Y h:i a' ); ?>
 													</p>
 												</section> -->
 
-												<section class="postbox yikes-easy-mc-postbox chimp-chatter-postbox <?php echo esc_attr( $section_class ); if( $x % 2 == 0 ) { echo ' even'; } ?>">
+												<section class="postbox yikes-easy-mc-postbox chimp-chatter-postbox <?php echo esc_attr( $section_class ); if ( $x % 2 == 0 ) { echo ' even'; } ?>">
 													<div class="inside">
-														<div class="chatter-type"><?php echo ucwords( $split_type[1] ); ?></div>
+														<div class="chatter-type"><?php echo ucwords( $split_type[ 1 ] ); ?></div>
 														<p class="chatter-message description">
-															<?php echo $activity['message']; ?>
+															<?php echo $activity[ 'message' ]; ?>
 														</p>
 														<p class="chatter-time">
-															<?php echo get_date_from_gmt( $activity['update_time'], 'F jS, Y h:i a' ); ?>
+															<?php echo get_date_from_gmt( $activity[ 'update_time' ], 'F jS, Y h:i a' ); ?>
 														</p>
 													</div>
 												</section>
 										<?php
-										if( $x == $end ) {
+										if ( $x == $end ) {
 											?>
 												</div>
 											<?php
@@ -154,7 +154,7 @@ 
 								?>
 
 								<div class="chimpchatter-button-container">
-									<a href="#" onclick="jQuery(this).parents().find('#hidden-chatter').slideToggle();jQuery(this).fadeOut();return false;" class="button-primary"><?php _e( 'View All Activity' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+									<a href="#" onclick="jQuery(this).parents().find('#hidden-chatter').slideToggle();jQuery(this).fadeOut();return false;" class="button-primary"><?php _e( 'View All Activity', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 								</div>
 
 						<!-- </div> -->
@@ -175,8 +175,8 @@ 
 					<div class="postbox yikes-easy-mc-postbox">
 						<div class="inside">
 
-							<a href="https://us3.admin.mailchimp.com/" title="<?php _e( 'MailChimp Site' , 'yikes-inc-easy-mailchimp-extender' ); ?>" target="_blank">
-								<img src="<?php echo YIKES_MC_URL . 'includes/images/Welcome_Page/mailchimp-logo.png'; ?>" title="<?php _e( 'MailChimp Site' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="chimp-chatter-mailchimp-logo">
+							<a href="https://us3.admin.mailchimp.com/" title="<?php _e( 'MailChimp Site', 'yikes-inc-easy-mailchimp-extender' ); ?>" target="_blank">
+								<img src="<?php echo YIKES_MC_URL . 'includes/images/Welcome_Page/mailchimp-logo.png'; ?>" title="<?php _e( 'MailChimp Site', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="chimp-chatter-mailchimp-logo">
 							</a>
 
 						</div>
@@ -186,60 +186,60 @@ 
 					<div class="postbox yikes-easy-mc-postbox chimp-chatter-sidebar">
 						<div class="inside">
 
-							<h2 class="account-status"><?php if( $account_details['has_activated'] == 1 ) { ?><div class="circle-account-active" title="<?php _e( "Account Active" , 'yikes-inc-easy-mailchimp-extender' ); ?>"></div><?php } else { ?><div class="circle-account-inactive" title="<?php _e( "Account Inactive" , 'yikes-inc-easy-mailchimp-extender' ); ?>"></div><?php } echo $new_account_details['username']; ?> <small>(<?php echo $new_account_details['role']; ?>)</small></h2>
+							<h2 class="account-status"><?php if ( $account_details[ 'has_activated' ] == 1 ) { ?><div class="circle-account-active" title="<?php _e( "Account Active", 'yikes-inc-easy-mailchimp-extender' ); ?>"></div><?php } else { ?><div class="circle-account-inactive" title="<?php _e( "Account Inactive", 'yikes-inc-easy-mailchimp-extender' ); ?>"></div><?php } echo $new_account_details[ 'username' ]; ?> <small>(<?php echo $new_account_details[ 'role' ]; ?>)</small></h2>
 
-							<img class="mailchimp-avatar" src="<?php echo esc_url_raw( $profile_info['avatar'] ); ?>" title="<?php echo $profile_info['username'] . ' ' . __( "MailChimp avatar" , 'yikes-inc-easy-mailchimp-extender' ); ?>">
+							<img class="mailchimp-avatar" src="<?php echo esc_url_raw( $profile_info[ 'avatar' ] ); ?>" title="<?php echo $profile_info[ 'username' ] . ' ' . __( "MailChimp avatar", 'yikes-inc-easy-mailchimp-extender' ); ?>">
 
 							<table class="form-table" id="account-details-table">
 								<tr valign="top">
 									<td scope="row">
 										<label for="tablecell">
-											<strong><?php _e( 'Company' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+											<strong><?php _e( 'Company', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 										</label>
 									</td>
-									<td><?php echo $new_account_details['contact']['company']; ?><br /><?php echo $new_account_details['contact']['city'] . ', ' . $new_account_details['contact']['state']; ?></td>
+									<td><?php echo $new_account_details[ 'contact' ][ 'company' ]; ?><br /><?php echo $new_account_details[ 'contact' ][ 'city' ] . ', ' . $new_account_details[ 'contact' ][ 'state' ]; ?></td>
 								</tr>
 								<tr valign="top">
 									<td scope="row">
 										<label for="tablecell">
-											<strong><?php _e( 'Industry' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+											<strong><?php _e( 'Industry', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 										</label>
 									</td>
-									<td><?php echo $account_details['industry']; ?></td>
+									<td><?php echo $account_details[ 'industry' ]; ?></td>
 								</tr>
 								<tr valign="top">
 									<td scope="row">
 										<label for="tablecell">
-											<strong><?php _e( 'Member Since' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+											<strong><?php _e( 'Member Since', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 										</label>
 									</td>
-									<td><?php echo date( get_option('date_format') , strtotime( $account_details['member_since'] ) ); ?></td>
+									<td><?php echo date( get_option( 'date_format' ), strtotime( $account_details[ 'member_since' ] ) ); ?></td>
 								</tr>
 								<tr valign="top">
 									<td scope="row">
 										<label for="tablecell">
-											<strong><?php _e( 'Plan Type' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+											<strong><?php _e( 'Plan Type', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 										</label>
 									</td>
-									<td><?php echo ucwords( $account_details['plan_type'] ); ?></td>
+									<td><?php echo ucwords( $account_details[ 'plan_type' ] ); ?></td>
 								</tr>
-								<?php if( $account_details['plan_type'] == 'payasyougo' || $account_details['plan_type'] == 'free' ) { ?>
+								<?php if ( $account_details[ 'plan_type' ] == 'payasyougo' || $account_details[ 'plan_type' ] == 'free' ) { ?>
 								<tr valign="top">
 									<td scope="row">
 										<label for="tablecell">
-											<strong><?php _e( 'Emails Left' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+											<strong><?php _e( 'Emails Left', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 										</label>
 									</td>
-									<td><?php echo number_format( $account_details['emails_left'] ); ?></td>
+									<td><?php echo number_format( $account_details[ 'emails_left' ] ); ?></td>
 								</tr>
 								<?php } ?>
 								<tr valign="top">
 									<td scope="row">
 										<label for="tablecell">
-											<strong><?php _e( 'Affiliate Link' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+											<strong><?php _e( 'Affiliate Link', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 										</label>
 									</td>
-									<td><a href="#" onclick="jQuery(this).hide().next().fadeIn('fast');return false;" class="button-secondary"><?php _e( 'View Link', 'yikes-inc-easy-mailchimp-extender' ); ?></a><input type="text" class="widefat mailchimp-affiliate-link" readonly value="<?php echo esc_url_raw( $account_details['affiliate_link'] ); ?>" onclick="jQuery(this).select();return false;"></td>
+									<td><a href="#" onclick="jQuery(this).hide().next().fadeIn('fast');return false;" class="button-secondary"><?php _e( 'View Link', 'yikes-inc-easy-mailchimp-extender' ); ?></a><input type="text" class="widefat mailchimp-affiliate-link" readonly value="<?php echo esc_url_raw( $account_details[ 'affiliate_link' ] ); ?>" onclick="jQuery(this).select();return false;"></td>
 								</tr>
 							</table>
 

admin/partials/menu/manage-forms.php

Spacing +50 added lines, -50 removed lines

@@ -6,13 +6,13 @@ 
 $all_forms = $form_interface->get_all_forms();
 
 /* Store Data if User is Authorized */
-if( $this->is_user_mc_api_valid_form( false ) == 'valid' ) {
+if ( $this->is_user_mc_api_valid_form( false ) == 'valid' ) {
 	$list_data = yikes_get_mc_api_manager()->get_list_handler()->get_lists();
 	if ( is_wp_error( $list_data ) ) {
 		$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
 		$error_logging->maybe_write_to_log(
 			$list_data->get_error_code(),
-			__( "Get Account Lists" , 'yikes-inc-easy-mailchimp-extender' ),
+			__( "Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ),
 			"Manage Forms Page"
 		);
 		$list_data = array();
@@ -23,24 +23,24 @@ 
 ?>
 <div class="wrap">
 	<!-- Freddie Logo -->
-	<img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - MailChimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
+	<img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - MailChimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
 
-	<h1>YIKES Easy Forms for MailChimp | <?php _e( 'Manage Forms' , 'yikes-inc-easy-mailchimp-extender' ) ?></h1>
+	<h1>YIKES Easy Forms for MailChimp | <?php _e( 'Manage Forms', 'yikes-inc-easy-mailchimp-extender' ) ?></h1>
 
 	<!-- Settings Page Description -->
-	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Create and manage your MailChimp opt-in forms on the following page. Select a form to make edits to it.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Create and manage your MailChimp opt-in forms on the following page. Select a form to make edits to it.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
 	<!-- Action Notices -->
 	<?php
 
 	/* If the user hasn't authenticated yet, lets kill off */
-	if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) != 'valid_api_key' ) {
-		wp_die( '<div class="error"><p>' . sprintf( __( 'You need to connect to MailChimp before you can start creating forms. Head over to the <a href="%s" title="Settings Page">Settings Page</a> and enter your API key.' , 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings' ) ) ) . '</p></div>' , 500 );
+	if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'valid_api_key' ) {
+		wp_die( '<div class="error"><p>' . sprintf( __( 'You need to connect to MailChimp before you can start creating forms. Head over to the <a href="%s" title="Settings Page">Settings Page</a> and enter your API key.', 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings' ) ) ) . '</p></div>', 500 );
 	}
 
 	/* Display our admin notices here */
 	// delete form success
-	if( isset( $_REQUEST['deleted-form'] ) && $_REQUEST['deleted-form'] == 'true' ) {
+	if ( isset( $_REQUEST[ 'deleted-form' ] ) && $_REQUEST[ 'deleted-form' ] == 'true' ) {
 		?>
 		<div class="updated manage-form-admin-notice">
 			<p><?php _e( 'Opt-in form successfully deleted.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -48,7 +48,7 @@ 
 		<?php
 	}
 	// duplicate form success
-	if( isset( $_REQUEST['duplicated-form'] ) && $_REQUEST['duplicated-form'] == 'true' ) {
+	if ( isset( $_REQUEST[ 'duplicated-form' ] ) && $_REQUEST[ 'duplicated-form' ] == 'true' ) {
 		?>
 		<div class="updated manage-form-admin-notice">
 			<p><?php _e( 'MailChimp Form successfully cloned.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -56,7 +56,7 @@ 
 		<?php
 	}
 	// duplicate form error
-	if( isset( $_REQUEST['duplicated-form'] ) && $_REQUEST['duplicated-form'] == 'false' ) {
+	if ( isset( $_REQUEST[ 'duplicated-form' ] ) && $_REQUEST[ 'duplicated-form' ] == 'false' ) {
 		?>
 		<div class="error manage-form-admin-notice">
 			<p><?php _e( 'There was an error trying to clone your form. Please try again. If this error persists, please contact the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -64,7 +64,7 @@ 
 		<?php
 	}
 	// reset form submission stats success
-	if( isset( $_REQUEST['reset-stats'] ) && $_REQUEST['reset-stats'] == 'true' ) {
+	if ( isset( $_REQUEST[ 'reset-stats' ] ) && $_REQUEST[ 'reset-stats' ] == 'true' ) {
 		?>
 		<div class="updated manage-form-admin-notice">
 			<p><?php _e( 'Form submission stats/rates successfully reset.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -72,7 +72,7 @@ 
 		<?php
 	}
 	// reset form submission stats error
-	if( isset( $_REQUEST['reset-stats'] ) && $_REQUEST['reset-stats'] == 'false' ) {
+	if ( isset( $_REQUEST[ 'reset-stats' ] ) && $_REQUEST[ 'reset-stats' ] == 'false' ) {
 		?>
 		<div class="error manage-form-admin-notice">
 			<p><?php _e( 'There was an error trying to reset the form submission stats/rates. Please try again. If this error persists, please contact the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -99,13 +99,13 @@ 
 								<thead>
 									<tr>
 										<th id="cb" class="manage-column column-cb check-column num" scope="col"><input type="checkbox" /></th>
-										<th id="columnname" class="manage-column column-columnname num yikes-form-id-number" scope="col"><?php _e( 'ID' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Description' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'List' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Impressions' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname num" scope="col" ><?php _e( 'Submissions' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Conversion Rate' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname num yikes-form-id-number" scope="col"><?php _e( 'ID', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Name', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Description', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'List', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Impressions', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname num" scope="col" ><?php _e( 'Submissions', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Conversion Rate', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
 									</tr>
 								</thead>
 								<!-- end header -->
@@ -114,13 +114,13 @@ 
 								<tfoot>
 									<tr>
 										<th class="manage-column column-cb check-column num" scope="col"><input type="checkbox" /></th>
-										<th id="columnname" class="manage-column column-columnname num yikes-form-id-number" scope="col"><?php _e( 'ID' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Description' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th class="manage-column column-columnname" scope="col"><?php _e( 'List' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Impressions' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Submissions' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Conversion Rate' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname num yikes-form-id-number" scope="col"><?php _e( 'ID', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Name', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Description', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th class="manage-column column-columnname" scope="col"><?php _e( 'List', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Impressions', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Submissions', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Conversion Rate', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
 									</tr>
 								</tfoot>
 								<!-- end footer -->
@@ -130,40 +130,40 @@ 
 									<?php
 									if ( count( $all_forms ) > 0 ) {
 										$i = 1;
-										foreach( $all_forms as $id => $form ) {
+										foreach ( $all_forms as $id => $form ) {
 										?>
-										<tr class="<?php if( $i % 2 == 0 ) { echo 'alternate'; } ?>">
+										<tr class="<?php if ( $i % 2 == 0 ) { echo 'alternate'; } ?>">
 											<th class="check-column num" scope="row"><input type="checkbox" /></th>
 											<td class="column-columnname num"><span class="form-id-container"><?php echo intval( $id ); ?></span></td>
 											<td class="column-columnname">
 												<!-- row title/link -->
-												<a href="<?php echo esc_url_raw( add_query_arg( array( 'id' => $id ) , admin_url( 'admin.php?page=yikes-mailchimp-edit-form' ) ) ); ?>" class="row-title">
-													<?php echo stripslashes( $form['form_name'] ); ?>
+												<a href="<?php echo esc_url_raw( add_query_arg( array( 'id' => $id ), admin_url( 'admin.php?page=yikes-mailchimp-edit-form' ) ) ); ?>" class="row-title">
+													<?php echo stripslashes( $form[ 'form_name' ] ); ?>
 												</a>
 												<div class="row-actions">
-													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'id' => $id ) , admin_url( 'admin.php?page=yikes-mailchimp-edit-form' ) ) ); ?>"><?php _e( "Edit" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
-													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-duplicate-form', 'mailchimp-form' => $id , 'nonce' => wp_create_nonce( 'duplicate-mailchimp-form-'.$id ) ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>"><?php _e( "Duplicate" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
-													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-reset-stats', 'mailchimp-form' => $id , 'nonce' => wp_create_nonce( 'reset-stats-mailchimp-form-'.$id ) ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>"><?php _e( "Reset Stats" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
-													<span><a href="#" class="view-yikes-mc-form-shortcode" data-alt-text="<?php _e( 'Stats' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( "Shortcode" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
+													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'id' => $id ), admin_url( 'admin.php?page=yikes-mailchimp-edit-form' ) ) ); ?>"><?php _e( "Edit", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
+													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-duplicate-form', 'mailchimp-form' => $id, 'nonce' => wp_create_nonce( 'duplicate-mailchimp-form-' . $id ) ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>"><?php _e( "Duplicate", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
+													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-reset-stats', 'mailchimp-form' => $id, 'nonce' => wp_create_nonce( 'reset-stats-mailchimp-form-' . $id ) ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>"><?php _e( "Reset Stats", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
+													<span><a href="#" class="view-yikes-mc-form-shortcode" data-alt-text="<?php _e( 'Stats', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( "Shortcode", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
 													<?php
 														/*
 														*	Custom action to allow users to add additional action links
 														*	to each form. We use this in our add-ons.
 														*	- Delete should remain last
 														*/
-														do_action( 'yikes-mailchimp-custom-form-actions' , $id );
+														do_action( 'yikes-mailchimp-custom-form-actions', $id );
 													?>
-													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-delete-form', 'mailchimp-form' => $id , 'nonce' => wp_create_nonce( 'delete-mailchimp-form-'.$id ) ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>" class="yikes-delete-mailchimp-form" onclick="return confirm('<?php printf( __( 'Are you sure you want to delete the %s form? This cannot be undone.' , 'yikes-inc-easy-mailchimp-extender' ), stripslashes( $form['form_name'] ) ); ?>');"><?php _e( "Delete" , 'yikes-inc-easy-mailchimp-extender' ); ?></a></span>
+													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-delete-form', 'mailchimp-form' => $id, 'nonce' => wp_create_nonce( 'delete-mailchimp-form-' . $id ) ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>" class="yikes-delete-mailchimp-form" onclick="return confirm('<?php printf( __( 'Are you sure you want to delete the %s form? This cannot be undone.', 'yikes-inc-easy-mailchimp-extender' ), stripslashes( $form[ 'form_name' ] ) ); ?>');"><?php _e( "Delete", 'yikes-inc-easy-mailchimp-extender' ); ?></a></span>
 												</div>
 											</td>
 
-											<td class="column-columnname"><?php echo isset( $form['form_description'] ) ? str_replace( '[yikes-mailchimp-subscriber-count]', do_shortcode( '[yikes-mailchimp-subscriber-count form="' . $id . '"]' ), $form['form_description'] ) : ''; ?></td>
+											<td class="column-columnname"><?php echo isset( $form[ 'form_description' ] ) ? str_replace( '[yikes-mailchimp-subscriber-count]', do_shortcode( '[yikes-mailchimp-subscriber-count form="' . $id . '"]' ), $form[ 'form_description' ] ) : ''; ?></td>
 											<td class="column-columnname">
 												<?php
 												if ( $list_data && count( $list_data ) > 0 ) {
 													$parsed = wp_list_pluck( $list_data, 'name', 'id' );
-													if ( isset( $parsed[ $form['list_id'] ] ) ) {
-														echo esc_textarea( $parsed[ $form['list_id'] ] );
+													if ( isset( $parsed[ $form[ 'list_id' ] ] ) ) {
+														echo esc_textarea( $parsed[ $form[ 'list_id' ] ] );
 													} else {
 														echo '<strong>' . __( 'List Not Found', 'yikes-inc-easy-mailchimp-extender' ) . '</strong>';
 													}
@@ -172,25 +172,25 @@ 
 
 											<td class="column-columnname num stat-container">
 												<?php
-													$impressions = number_format( $form['impressions'] );
-													echo '<span title="' . __( 'Impressions' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . $impressions . '</span>';
+													$impressions = number_format( $form[ 'impressions' ] );
+													echo '<span title="' . __( 'Impressions', 'yikes-inc-easy-mailchimp-extender' ) . '">' . $impressions . '</span>';
 												?>
 											</td>
 											<td class="column-columnname num stat-container">
 												<?php
-													$submissions = number_format( $form['submissions'] );
-													echo '<span title="' . __( 'Submissions' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . $submissions . '</span>';
+													$submissions = number_format( $form[ 'submissions' ] );
+													echo '<span title="' . __( 'Submissions', 'yikes-inc-easy-mailchimp-extender' ) . '">' . $submissions . '</span>';
 												?>
 											</td>
 											<td class="column-columnname num stat-container">
 												<?php
-													if( $impressions != 0 ) {
-														$conversion_rate = '%' . ( round( $form['submissions'] / $form['impressions'] , 2 ) * 100 );
-														if( $conversion_rate >= '%15' ) {
+													if ( $impressions != 0 ) {
+														$conversion_rate = '%' . ( round( $form[ 'submissions' ] / $form[ 'impressions' ], 2 ) * 100 );
+														if ( $conversion_rate >= '%15' ) {
 															$conversion_color = '#00cc00'; // green (unicorn!)
-														} else if( $conversion_rate < '%15' && $conversion_rate >= '%10' ) {
+														} else if ( $conversion_rate < '%15' && $conversion_rate >= '%10' ) {
 															$conversion_color = '#0080FF'; // light blue (good)
-														} else if( $conversion_rate < '%10' && $conversion_rate >= '%5' ) {
+														} else if ( $conversion_rate < '%10' && $conversion_rate >= '%5' ) {
 															$conversion_color = '#FFFF32'; // yellow (ok)
 														} else {
 															$conversion_color = '#FF0000'; // red (no bueno)
@@ -199,7 +199,7 @@ 
 														$conversion_rate = '%0';
 														$conversion_color = '#333333';
 													}
-													echo '<span style="color:' . esc_attr( $conversion_color ) . ';" title="' . esc_attr__( 'Conversion Rate' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . $conversion_rate . '</span>';
+													echo '<span style="color:' . esc_attr( $conversion_color ) . ';" title="' . esc_attr__( 'Conversion Rate', 'yikes-inc-easy-mailchimp-extender' ) . '">' . $conversion_rate . '</span>';
 												?>
 											</td>
 											<!-- shortcode -->
@@ -212,7 +212,7 @@ 
 											}
 										} else { ?>
 										<tr class="no-items">
-											<td class="colspanchange no-mailchimp-forms-found" colspan="8"><em><?php _e( 'No MailChimp forms found. Use the form to the right to create a new one.' , 'yikes-inc-easy-mailchimp-extender' ); ?></em></td>
+											<td class="colspanchange no-mailchimp-forms-found" colspan="8"><em><?php _e( 'No MailChimp forms found. Use the form to the right to create a new one.', 'yikes-inc-easy-mailchimp-extender' ); ?></em></td>
 										</tr>
 									<?php } ?>
 								</tbody>

admin/partials/menu/manage-lists.php

Spacing +16 added lines, -16 removed lines

@@ -17,16 +17,16 @@ 
 ?>
 <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 _e( 'Manage Mailing Lists' , 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
+	<h1>YIKES Easy Forms for MailChimp | <?php _e( 'Manage Mailing Lists', 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
 
 	<!-- Settings Page Description -->
-	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Make edits to your MailChimp lists on the following page. Select a list to make edits to it.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Make edits to your MailChimp lists on the following page. Select a list to make edits to it.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
 	<?php
 		/* If the user hasn't authenticated yet, lets kill off */
-		if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) != 'valid_api_key' ) {
+		if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'valid_api_key' ) {
 
 			$error_string = sprintf(
 				esc_html__( 'You need to connect to MailChimp before you can start creating forms. Head over to the %s and enter your API key.', 'yikes-inc-easy-mailchimp-extender' ),
@@ -62,8 +62,8 @@ 
 									<!-- TABLE HEAD -->
 									<thead>
 										<tr>
-											<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'List Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-											<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Subscriber Count' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+											<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'List Name', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+											<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Subscriber Count', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
 										</tr>
 									</thead>
 									<!-- end header -->
@@ -71,25 +71,25 @@ 
 									<!-- FOOTER -->
 									<tfoot>
 										<tr>
-											<th class="manage-column column-columnname" scope="col"><?php _e( 'List Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-											<th class="manage-column column-columnname num" scope="col"><?php _e( 'Subscriber Count' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+											<th class="manage-column column-columnname" scope="col"><?php _e( 'List Name', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+											<th class="manage-column column-columnname num" scope="col"><?php _e( 'Subscriber Count', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
 										</tr>
 									</tfoot>
 									<!-- end footer -->
 
 									<!-- TABLE BODY -->
 									<tbody>
-										<?php if( count( $list_data ) > 0 ) {
+										<?php if ( count( $list_data ) > 0 ) {
 											$i = 1;
-											foreach( $list_data as $list ) {
+											foreach ( $list_data as $list ) {
 												?>
-												<tr class="<?php if( $i % 2 == 0 ) { echo 'alternate'; } ?>">
+												<tr class="<?php if ( $i % 2 == 0 ) { echo 'alternate'; } ?>">
 													<td class="column-columnname">
-														<a href="<?php echo esc_url_raw( add_query_arg( array( 'list-id' => $list['id'] ) , admin_url( 'admin.php?page=yikes-mailchimp-view-list' ) ) ); ?>" class="row-title">
-															<?php echo stripslashes( $list['name'] ); ?>
+														<a href="<?php echo esc_url_raw( add_query_arg( array( 'list-id' => $list[ 'id' ] ), admin_url( 'admin.php?page=yikes-mailchimp-view-list' ) ) ); ?>" class="row-title">
+															<?php echo stripslashes( $list[ 'name' ] ); ?>
 														</a>
 														<div class="row-actions">
-															<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'list-id' => $list['id'] ) , admin_url( 'admin.php?page=yikes-mailchimp-view-list' ) ) ); ?>"><?php _e( "View" , 'yikes-inc-easy-mailchimp-extender' ); ?></a></span>
+															<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'list-id' => $list[ 'id' ] ), admin_url( 'admin.php?page=yikes-mailchimp-view-list' ) ) ); ?>"><?php _e( "View", 'yikes-inc-easy-mailchimp-extender' ); ?></a></span>
 															<?php
 																/*
 																*	Custom action to allow users to add additional action links
@@ -99,7 +99,7 @@ 
 															?>
 														</div>
 													</td>
-													<td class="column-columnname num"><?php echo $list['stats']['member_count']; ?></td>
+													<td class="column-columnname num"><?php echo $list[ 'stats' ][ 'member_count' ]; ?></td>
 												</tr>
 												<?php
 												$i++;
@@ -107,7 +107,7 @@ 
 											} else {
 											?>
 											<tr class="no-items">
-												<td class="colspanchange no-mailchimp-lists-found" colspan="3"><em><?php printf( __( 'No MailChimp lists found. Head over to <a href="%s" title="MailChimp.com">MailChimp.com</a> to setup your first mailing list. Once thats done you can head back here to customize it!' , 'yikes-inc-easy-mailchimp-extender' ), esc_url( 'http://mailchimp.com/' ) ); ?></em></td>
+												<td class="colspanchange no-mailchimp-lists-found" colspan="3"><em><?php printf( __( 'No MailChimp lists found. Head over to <a href="%s" title="MailChimp.com">MailChimp.com</a> to setup your first mailing list. Once thats done you can head back here to customize it!', 'yikes-inc-easy-mailchimp-extender' ), esc_url( 'http://mailchimp.com/' ) ); ?></em></td>
 											</tr>
 										<?php } ?>
 									</tbody>

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['lists'][0]['name']; ?> <small><a href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-view-list&list-id=' . $list_data['lists'][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[ 'lists' ][ 0 ][ 'name' ]; ?> <small><a href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-view-list&list-id=' . $list_data[ 'lists' ][ 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['lists'][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[ 'lists' ][ 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['lists'][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[ 'lists' ][ 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['lists'][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[ 'lists' ][ 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['lists'][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[ 'lists' ][ 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/class.list-activity-widget.php

Spacing +9 added lines, -9 removed lines

@@ -48,14 +48,14 @@ 
 		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.
+				'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.
+				'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.
 			);
 		}
@@ -67,22 +67,22 @@ 
 	function list_stats_dashboard_widget() {
 		// Get our list data!
 		$list_data = yikes_get_mc_api_manager()->get_list_handler()->get_lists();
-		if ( isset( $list_data['error'] ) ) {
+		if ( isset( $list_data[ 'error' ] ) ) {
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-			$error_logging->maybe_write_to_log( $list_data['error'], __( "Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ), "Dashboard Activity Widget" );
+			$error_logging->maybe_write_to_log( $list_data[ 'error' ], __( "Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ), "Dashboard Activity Widget" );
 		}
 
 		?>
 		<!-- Dropdown to Change the list -->
-		<?php if ( ! empty( $list_data['lists'] ) ) {
+		<?php if ( ! empty( $list_data[ 'lists' ] ) ) {
 			?>
 			<section class="inside-widget yikes-dashboard-widget-section">
 			<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['lists'] as $list ) {
+				foreach ( $list_data[ 'lists' ] as $list ) {
 					?>
-					<option value="<?php echo $list['id']; ?>"><?php echo $list['name']; ?></option>
+					<option value="<?php echo $list[ 'id' ]; ?>"><?php echo $list[ 'name' ]; ?></option>
 					<?php
 				}
 				?>

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

Spacing +10 added lines, -10 removed lines

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

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

Spacing +9 added lines, -9 removed lines

@@ -103,7 +103,7 @@ 
 	 * @return array|WP_Error
 	 */
 	public function patch( $path = '', $headers = array(), $params = array() ) {
-		if ( ! isset( $params['body'] ) || empty( $params['body'] ) ) {
+		if ( ! isset( $params[ 'body' ] ) || empty( $params[ 'body' ] ) ) {
 			return new WP_Error(
 				'yikesinc_eme_missing_body',
 				sprintf(
@@ -130,7 +130,7 @@ 
 	 * @return array|WP_Error
 	 */
 	public function post( $path = '', $headers = array(), $params = array() ) {
-		if ( ! isset( $params['body'] ) || empty( $params['body'] ) ) {
+		if ( ! isset( $params[ 'body' ] ) || empty( $params[ 'body' ] ) ) {
 			return new WP_Error(
 				'yikesinc_eme_missing_body',
 				sprintf(
@@ -157,7 +157,7 @@ 
 	 * @return array|WP_Error
 	 */
 	public function put( $path = '', $headers = array(), $params = array() ) {
-		if ( ! isset( $params['body'] ) || empty( $params['body'] ) ) {
+		if ( ! isset( $params[ 'body' ] ) || empty( $params[ 'body' ] ) ) {
 			return new WP_Error(
 				'yikesinc_eme_missing_body',
 				sprintf(
@@ -288,13 +288,13 @@ 
 		$authorized_args = $this->get_authorized_args();
 
 		// If we have body data, maybe convert it to JSON.
-		if ( isset( $params['body'] ) && ( is_array( $params['body'] ) || is_object( $params['body'] ) ) ) {
-			$params['body']          = json_encode( wp_parse_args( $authorized_args['body'], $params['body'] ) );
-			$headers['Content-Type'] = 'application/json';
+		if ( isset( $params[ 'body' ] ) && ( is_array( $params[ 'body' ] ) || is_object( $params[ 'body' ] ) ) ) {
+			$params[ 'body' ]          = json_encode( wp_parse_args( $authorized_args[ 'body' ], $params[ 'body' ] ) );
+			$headers[ 'Content-Type' ] = 'application/json';
 		}
 
 		// Combine the given headers and auth headers
-		$headers = wp_parse_args( $authorized_args['headers'], $headers );
+		$headers = wp_parse_args( $authorized_args[ 'headers' ], $headers );
 		/**
 		 * Filter the headers used for a request to the MailChimp API.
 		 *
@@ -358,12 +358,12 @@ 
 
 		// Version 2.0 uses body authorization
 		if ( version_compare( '3.0', $this->api_version, '>' ) ) {
-			$args['body'] = $this->get_auth_body();
+			$args[ 'body' ] = $this->get_auth_body();
 		}
 
 		// Version 3.0 uses authorization headers.
 		if ( version_compare( '3.0', $this->api_version, '<=' ) ) {
-			$args['headers'] = $this->get_auth_headers();
+			$args[ 'headers' ] = $this->get_auth_headers();
 		}
 
 		return $args;