yikesinc / yikes-inc-easy-mailchimp-extender

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>

admin/partials/menu/options-sections/import-export-forms.php

Spacing +19 added lines, -19 removed lines

@@ -5,65 +5,65 @@
 	// return it as an array, so we can work with it to build our form below
 	$all_forms = $wpdb->get_results( 'SELECT id, form_name FROM ' . $wpdb->prefix . 'yikes_easy_mc_forms', ARRAY_A );
 ?>
-<h3><span><?php _e( 'Import/Export Forms & Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
+<h3><span><?php _e( 'Import/Export Forms & Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
 
 <div class="inside">	
 					
 	<!-- Export Form -->
-	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-export-forms' , 'nonce' => wp_create_nonce( 'export-forms' ) ) ) ); ?>" method="post">							
+	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-export-forms', 'nonce' => wp_create_nonce( 'export-forms' ) ) ) ); ?>" method="post">							
 									
-		<p><strong><?php _e( "Export Forms" , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
+		<p><strong><?php _e( "Export Forms", 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
 		<p class="description">
-			<?php _e( "Select the forms you would like to export. When you click the download button below, Easy Forms for MailChimp will create a CSV file for you to save to your computer. Once you've saved the download file, you can use the Import tool to import the forms to this or any other site." , "yikes-inc-easy-mailchimp-extender" ); ?>
+			<?php _e( "Select the forms you would like to export. When you click the download button below, Easy Forms for MailChimp will create a CSV file for you to save to your computer. Once you've saved the download file, you can use the Import tool to import the forms to this or any other site.", "yikes-inc-easy-mailchimp-extender" ); ?>
 		</p>
 	
-			<?php if( !empty( $all_forms ) ) { ?>	
+			<?php if ( ! empty( $all_forms ) ) { ?>	
 				<!-- custom list so users can export specific forms -->
-				<a class="toggle-custom-lists button-secondary" onclick="jQuery(this).next().slideToggle();return false;"><?php _e( 'Select Forms' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+				<a class="toggle-custom-lists button-secondary" onclick="jQuery(this).next().slideToggle();return false;"><?php _e( 'Select Forms', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 				<ul class="export-custom-forms-list">
-					<p class="description"><?php _e( 'Select which forms to export. Leave all checkboxes unchecked to export all of your forms.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
-					<?php foreach( $all_forms as $form ) { ?>
-						<li><label><input type="checkbox" name="export_forms[]" value="<?php echo (int) $form['id']; ?>"><?php echo esc_html( $form['form_name'] ); ?></label></li>
+					<p class="description"><?php _e( 'Select which forms to export. Leave all checkboxes unchecked to export all of your forms.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+					<?php foreach ( $all_forms as $form ) { ?>
+						<li><label><input type="checkbox" name="export_forms[]" value="<?php echo (int) $form[ 'id' ]; ?>"><?php echo esc_html( $form[ 'form_name' ] ); ?></label></li>
 					<?php } ?>
 				</ul>
 			<?php } else { ?>
-				<p><em><?php _e( "It looks like you haven't created any forms yet." , "yikes-inc-easy-mailchimp-extender" ); ?></em></p>
+				<p><em><?php _e( "It looks like you haven't created any forms yet.", "yikes-inc-easy-mailchimp-extender" ); ?></em></p>
 			<?php } ?>
 		<!-- check if any of our transients contain data -->							
-		<p><input type="submit" class="button-primary" value="<?php _e( 'Export Opt-in Forms' , 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
+		<p><input type="submit" class="button-primary" value="<?php _e( 'Export Opt-in Forms', 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
 					
 	</form>
 	
 	<hr />
 	
 	<!-- Export Form -->
-	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-export-settings' , 'nonce' => wp_create_nonce( 'export-settings' ) ) ) ); ?>" method="post">							
+	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-export-settings', 'nonce' => wp_create_nonce( 'export-settings' ) ) ) ); ?>" method="post">							
 									
-		<p><strong><?php _e( "Export Settings" , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
+		<p><strong><?php _e( "Export Settings", 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
 		<p class="description">
-			<?php _e( "Export YIKES Easy Forms for MailChimp plugin settings." , "yikes-inc-easy-mailchimp-extender" ); ?>
+			<?php _e( "Export YIKES Easy Forms for MailChimp plugin settings.", "yikes-inc-easy-mailchimp-extender" ); ?>
 		</p>
 
 		<!-- check if any of our transients contain data -->							
-		<p><input type="submit" class="button-primary" value="<?php _e( 'Export Plugin Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
+		<p><input type="submit" class="button-primary" value="<?php _e( 'Export Plugin Settings', 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
 					
 	</form>
 	
 	<hr />
 	
 	<!-- Import Form -->	
-	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-import-forms' , 'nonce' => wp_create_nonce( 'import-forms' ) ) ) ); ?>" method="post" enctype="multipart/form-data">							
+	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-import-forms', 'nonce' => wp_create_nonce( 'import-forms' ) ) ) ); ?>" method="post" enctype="multipart/form-data">							
 									
-		<p><strong><?php _e( "Import" , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
+		<p><strong><?php _e( "Import", 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
 		<p class="description">
-			<?php _e( "Select the Easy Forms for MailChimp export file you would like to import. You can use this field to import your opt-in forms or settings. " , "yikes-inc-easy-mailchimp-extender" ); ?>
+			<?php _e( "Select the Easy Forms for MailChimp export file you would like to import. You can use this field to import your opt-in forms or settings. ", "yikes-inc-easy-mailchimp-extender" ); ?>
 		</p>
 		
 		<label>
 			<input type="file" name="csv" id="forms_to_import">
 		</label>
 		<!-- check if any of our transients contain data -->							
-		<p><input type="submit" class="button-primary" value="<?php _e( 'Import' , 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
+		<p><input type="submit" class="button-primary" value="<?php _e( 'Import', 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
 					
 	</form>
 	

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

Spacing +52 added lines, -52 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,50 +43,50 @@ 
 	);
 	
 	$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
 		// lets confirm the user has a valid API key stored
-		if( $this->is_user_mc_api_valid_form( false ) == 'valid' ) {
+		if ( $this->is_user_mc_api_valid_form( false ) == 'valid' ) {
 			/// Check for a transient, if not - set one up for one hour
 			if ( false === ( $list_data = get_transient( 'yikes-easy-mailchimp-list-data' ) ) ) {
-				$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
+				$api_key = trim( get_option( 'yikes-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( 
@@ -98,11 +98,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' ), "Integration Settings Page" );
+						$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data[ 'error' ], __( "Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ), "Integration Settings Page" );
 					}
 				} else {
 					// set our transient
@@ -113,7 +113,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
@@ -124,7 +124,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 -->
@@ -134,54 +134,54 @@ 
 	
 	<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( $list_data['total'] > 0 ) {
+										if ( $list_data[ 'total' ] > 0 ) {
 											?>
 												<select class="optin-checkbox-init[<?php echo $class; ?>][associated-list] checkbox-settings-list-dropdown" 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['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[ '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>
 								
@@ -192,8 +192,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 ); 
 										}
@@ -208,7 +208,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
 			}

Braces +2 added lines, -2 removed lines

@@ -98,7 +98,7 @@ 
 					'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 				) );
 				$list_data = json_decode( wp_remote_retrieve_body( $list_data ), true );
-				if( isset( $list_data['error'] ) ) {	
+				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();
@@ -134,7 +134,7 @@ 
 	
 	<ul>
 		<?php 
-			if( !empty( $active_plugins ) ) { 
+			if( !empty( $active_plugins ) ) {
 				
 				foreach( $active_plugins as $class => $value ) {
 					// echo  $class;

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

Spacing +5 added lines, -5 removed lines

@@ -2,7 +2,7 @@ 
 	General Settings Options Template
 	-- yea
 -->
-<h3><span><?php _e( 'General Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span><?php echo $api_connection; ?></h3>
+<h3><span><?php _e( 'General Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span><?php echo $api_connection; ?></h3>
 <div class="inside">
 									
 	<!-- Settings Form -->
@@ -15,15 +15,15 @@ 
 		<!-- MailChimp API Input Field -->
 		<label for="yks-mailchimp-api-key">
 		
-			<p><?php _e( 'Enter your API key in the field below to connect your site to your MailChimp account.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+			<p><?php _e( 'Enter your API key in the field below to connect your site to your MailChimp account.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 			
-			<p><strong><?php _e( 'MailChimp API Key' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
+			<p><strong><?php _e( 'MailChimp API Key', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
 			
-			<input autocomplete="off" <?php if( strlen( trim( get_option( 'yikes-mc-api-key' , '' ) ) ) > 0 ) { ?> type="password" <?php } else { ?> type="text" <?php } ?> value="<?php echo trim( get_option( 'yikes-mc-api-key' , '' ) ); ?>" placeholder="<?php _e( 'MailChimp API Key' , 'yikes-inc-easy-mailchimp-extender' ); ?>" name="yikes-mc-api-key" id="yikes-mc-api-key" class="settings-page-input" />
+			<input autocomplete="off" <?php if ( strlen( trim( get_option( 'yikes-mc-api-key', '' ) ) ) > 0 ) { ?> type="password" <?php } else { ?> type="text" <?php } ?> value="<?php echo trim( get_option( 'yikes-mc-api-key', '' ) ); ?>" placeholder="<?php _e( 'MailChimp API Key', 'yikes-inc-easy-mailchimp-extender' ); ?>" name="yikes-mc-api-key" id="yikes-mc-api-key" class="settings-page-input" />
 			
 			<?php echo $api_error_response; ?>
 			
-			<p class="description"><small><a href="https://admin.mailchimp.com/account/api" target="_blank" title="<?php _e( 'Get your API key here' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Get your API key here' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p>
+			<p class="description"><small><a href="https://admin.mailchimp.com/account/api" target="_blank" title="<?php _e( 'Get your API key here', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Get your API key here', 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p>
 		
 		</label>
 												

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

Spacing +5 added lines, -5 removed lines

@@ -4,7 +4,7 @@ 
 	- php version, wp version, plugin version and debug log
 -->
 
-<h3><span><?php _e( 'Debug Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
+<h3><span><?php _e( 'Debug Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
 
 <div class="inside">
 	
@@ -13,10 +13,10 @@ 
 	
 		<?php settings_fields( 'yikes_inc_easy_mc_debug_settings_page' ); ?>
 	
-		<label for="yikes-mailchimp-debug-status"><strong><?php _e( 'Enable Debugging' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-			<input type="checkbox" name="yikes-mailchimp-debug-status" id="yikes-mailchimp-debug-status" value="1" <?php checked( get_option( 'yikes-mailchimp-debug-status' , '' ) , '1' ); ?>>
+		<label for="yikes-mailchimp-debug-status"><strong><?php _e( 'Enable Debugging', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+			<input type="checkbox" name="yikes-mailchimp-debug-status" id="yikes-mailchimp-debug-status" value="1" <?php checked( get_option( 'yikes-mailchimp-debug-status', '' ), '1' ); ?>>
 		</label>
-		<p class="description"><?php _e( "If you encounter an issue with Easy Forms for MailChimp you can toggle on debugging to display advanced error messages and start logging errors." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<p class="description"><?php _e( "If you encounter an issue with Easy Forms for MailChimp you can toggle on debugging to display advanced error messages and start logging errors.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 		
 		<?php submit_button(); ?>
 									
@@ -35,7 +35,7 @@ 
 				)
 			);
 		?>
-		<h2><?php _e( "Debug Log" , 'yikes-inc-easy-mailchimp-extender' ); ?> &nbsp; <a href="<?php echo $url; ?>" class="button-secondary"><?php _e( 'Clear Log', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h2>
+		<h2><?php _e( "Debug Log", 'yikes-inc-easy-mailchimp-extender' ); ?> &nbsp; <a href="<?php echo $url; ?>" class="button-secondary"><?php _e( 'Clear Log', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h2>
 		
 		<table class="widefat" id="yikes-mailchimp-error-log">
 			<!-- table header -->

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

Spacing +11 added lines, -11 removed lines

@@ -12,16 +12,16 @@ 
 
 ?>
 
-<h3><span><?php _e( 'reCAPTCHA Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
+<h3><span><?php _e( 'reCAPTCHA Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
 
 <div class="inside">
 	
 	<p>
-		<?php _e( 'reCAPTCHA is a free CAPTCHA service, from Google, that helps protect your site against spam, malicious registrations and other forms of attacks where computers try to disguise themselves as a human. reCAPTCHA will help prevent spammers and bots from submitting data through your MailChimp forms.' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+		<?php _e( 'reCAPTCHA is a free CAPTCHA service, from Google, that helps protect your site against spam, malicious registrations and other forms of attacks where computers try to disguise themselves as a human. reCAPTCHA will help prevent spammers and bots from submitting data through your MailChimp forms.', 'yikes-inc-easy-mailchimp-extender' ); ?>
 	</p>
 	
 	<p>
-		<?php echo '<a href="https://www.google.com/recaptcha/admin" target="_blank" title="' . __( 'Get your reCAPTCHA API Key' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Get Your reCAPTCHA API Key' , 'yikes-inc-easy-mailchimp-extender' ) . '</a>'; ?>
+		<?php echo '<a href="https://www.google.com/recaptcha/admin" target="_blank" title="' . __( 'Get your reCAPTCHA API Key', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Get Your reCAPTCHA API Key', 'yikes-inc-easy-mailchimp-extender' ) . '</a>'; ?>
 	</p>
 	
 	<!-- Settings Form -->
@@ -29,21 +29,21 @@ 
 		
 		<?php settings_fields( 'yikes_inc_easy_mc_recaptcha_settings_page' ); ?>
 		
-			<label for="yikes-mc-recaptcha-setting"><strong><?php _e( 'Enable reCAPTCHA Protection' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-				<input type="checkbox" name="yikes-mc-recaptcha-status" class="recaptcha-setting-checkbox" value="1" <?php checked( get_option( 'yikes-mc-recaptcha-status' , '' ) , '1' ); ?>>
+			<label for="yikes-mc-recaptcha-setting"><strong><?php _e( 'Enable reCAPTCHA Protection', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+				<input type="checkbox" name="yikes-mc-recaptcha-status" class="recaptcha-setting-checkbox" value="1" <?php checked( get_option( 'yikes-mc-recaptcha-status', '' ), '1' ); ?>>
 			</label>
 			
-			<label for="yikes-mc-recaptcha-api-key"><strong><?php _e( 'reCAPTCHA Site Key' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-				<input type="text" class="widefat recaptcha-setting-checkbox" name="yikes-mc-recaptcha-site-key" value="<?php echo esc_attr( get_option( 'yikes-mc-recaptcha-site-key' , '' ) ); ?>">
+			<label for="yikes-mc-recaptcha-api-key"><strong><?php _e( 'reCAPTCHA Site Key', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+				<input type="text" class="widefat recaptcha-setting-checkbox" name="yikes-mc-recaptcha-site-key" value="<?php echo esc_attr( get_option( 'yikes-mc-recaptcha-site-key', '' ) ); ?>">
 			</label>
 			
-			<label for="yikes-mc-recaptcha-private-api-key"><strong><?php _e( 'reCAPTCHA Secret Key' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-				<input type="text" class="widefat recaptcha-setting-checkbox" name="yikes-mc-recaptcha-secret-key" id="" value="<?php echo esc_attr( get_option( 'yikes-mc-recaptcha-secret-key' , '' ) ); ?>">
+			<label for="yikes-mc-recaptcha-private-api-key"><strong><?php _e( 'reCAPTCHA Secret Key', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+				<input type="text" class="widefat recaptcha-setting-checkbox" name="yikes-mc-recaptcha-secret-key" id="" value="<?php echo esc_attr( get_option( 'yikes-mc-recaptcha-secret-key', '' ) ); ?>">
 			</label>
 			
-			<a href="#" onclick="jQuery(this).next().slideToggle();return false;" class="recaptcha-preview-link"><?php _e( 'View reCAPTCHA Preview' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+			<a href="#" onclick="jQuery(this).next().slideToggle();return false;" class="recaptcha-preview-link"><?php _e( 'View reCAPTCHA Preview', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 				<span class="recaptcha-preview-container">
-					<img src="<?php echo YIKES_MC_URL . 'includes/images/recaptcha/recaptcha-demo.gif'; ?>" alt="<?php _e( 'reCAPTCHA Preview' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="recaptcha-demo-gif">
+					<img src="<?php echo YIKES_MC_URL . 'includes/images/recaptcha/recaptcha-demo.gif'; ?>" alt="<?php _e( 'reCAPTCHA Preview', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="recaptcha-demo-gif">
 				</span>
 			
 			

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

Spacing +22 added lines, -22 removed lines

@@ -2,7 +2,7 @@ 
 
 // print_r( $interest_groupings );
 
-$integration_options = get_option( 'optin-checkbox-init' , '' );	
+$integration_options = get_option( 'optin-checkbox-init', '' );	
 
 // print_r( $integration_options );
 
@@ -11,8 +11,8 @@ 
 /*
 * Confirm the interest groups is an array and not empty or else bail
 */
-if( isset( $interest_groupings['error'] ) ) {
-	echo '<p class="description no-interest-groupings-enabled-message">' . $interest_groupings['error'] . '</p>';
+if ( isset( $interest_groupings[ 'error' ] ) ) {
+	echo '<p class="description no-interest-groupings-enabled-message">' . $interest_groupings[ 'error' ] . '</p>';
 	return;
 }
 
@@ -25,30 +25,30 @@ 
 /*
 *	Loop over interest groups
 */
-foreach( $interest_groupings as $interest_group ) {
+foreach ( $interest_groupings as $interest_group ) {
 	
-	$interest_group_id = $interest_group['id'];
-	$interest_group_type = ( isset( $interest_group['form_field'] ) ) ? $interest_group['form_field'] : '';
-	$interest_groups_fields = ( isset( $interest_group['groups'] ) ) ? $interest_group['groups'] : false; // if not set return false
-	$selected_interest_groups = ( isset( $integration_options[$integration_type]['interest-groups'] ) ) ? $integration_options[$integration_type]['interest-groups'] : array();
+	$interest_group_id = $interest_group[ 'id' ];
+	$interest_group_type = ( isset( $interest_group[ 'form_field' ] ) ) ? $interest_group[ 'form_field' ] : '';
+	$interest_groups_fields = ( isset( $interest_group[ 'groups' ] ) ) ? $interest_group[ 'groups' ] : false; // if not set return false
+	$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['name'] ); ?></strong>
+		<strong class="interest-group-section-title"><?php echo ucwords( $interest_group[ 'name' ] ); ?></strong>
 	<?php
 	/*
 	*	Loop over the interest group types, and return the appropriate type
 	*/	
-	switch( $interest_group_type ) {
+	switch ( $interest_group_type ) {
 	
 		default:
 		case 'hidden':
 		case 'checkboxes':
-			if( $interest_groups_fields ) {
-				foreach( $interest_groups_fields as $field ) {
+			if ( $interest_groups_fields ) {
+				foreach ( $interest_groups_fields as $field ) {
 				?>
 					<label>
-						<input type="checkbox" name="optin-checkbox-init[<?php echo $integration_type; ?>][interest-groups][<?php echo $interest_group_id; ?>][]" value="<?php echo $field['name']; ?>" <?php if( isset( $selected_interest_groups[$interest_group_id] ) ) {  if( in_array( $field['name'], $selected_interest_groups[$interest_group_id] ) ) { ?> checked="checked" <?php } } ?>>
-						<?php echo $field['name']; ?>
+						<input type="checkbox" name="optin-checkbox-init[<?php echo $integration_type; ?>][interest-groups][<?php echo $interest_group_id; ?>][]" value="<?php echo $field[ 'name' ]; ?>" <?php if ( isset( $selected_interest_groups[ $interest_group_id ] ) ) {  if ( in_array( $field[ 'name' ], $selected_interest_groups[ $interest_group_id ] ) ) { ?> checked="checked" <?php } } ?>>
+						<?php echo $field[ 'name' ]; ?>
 					</label>
 				<?php
 				}
@@ -56,13 +56,13 @@ 
 			break;
 			
 		case 'radio':
-			if( $interest_groups_fields ) {
+			if ( $interest_groups_fields ) {
 				$x = 1; //  used to decide which is pre-checked
-				foreach( $interest_groups_fields as $field ) {
+				foreach ( $interest_groups_fields as $field ) {
 				?>
 					<label>
-						<input type="radio" name="optin-checkbox-init[<?php echo $integration_type; ?>][interest-groups][<?php echo $interest_group_id; ?>][]" value="<?php echo $field['name']; ?>" <?php if( isset( $selected_interest_groups[$interest_group_id] ) ) {  if( in_array( $field['name'], $selected_interest_groups[$interest_group_id] ) ) { ?> checked="checked" <?php } } elseif( $x == 1 ) { ?> checked="checked" <?php }?>>
-						<?php echo $field['name']; ?>
+						<input type="radio" name="optin-checkbox-init[<?php echo $integration_type; ?>][interest-groups][<?php echo $interest_group_id; ?>][]" value="<?php echo $field[ 'name' ]; ?>" <?php if ( isset( $selected_interest_groups[ $interest_group_id ] ) ) {  if ( in_array( $field[ 'name' ], $selected_interest_groups[ $interest_group_id ] ) ) { ?> checked="checked" <?php } } elseif ( $x == 1 ) { ?> checked="checked" <?php }?>>
+						<?php echo $field[ 'name' ]; ?>
 					</label>
 				<?php
 					$x++;
@@ -71,12 +71,12 @@ 
 			break;
 			
 		case 'dropdown':
-			if( $interest_groups_fields ) {
+			if ( $interest_groups_fields ) {
 				?><select name="optin-checkbox-init[<?php echo $integration_type; ?>][interest-groups][<?php echo $interest_group_id; ?>][]"><?php
-				foreach( $interest_groups_fields as $field ) {
+				foreach ( $interest_groups_fields as $field ) {
 				?>
-					<option  value="<?php echo $field['name']; ?>" <?php if( isset( $selected_interest_groups[$interest_group_id] ) ) {  if( in_array( $field['name'], $selected_interest_groups[$interest_group_id] ) ) { ?> selected="selected" <?php } } ?>>
-						<?php echo $field['name']; ?>
+					<option  value="<?php echo $field[ 'name' ]; ?>" <?php if ( isset( $selected_interest_groups[ $interest_group_id ] ) ) {  if ( in_array( $field[ 'name' ], $selected_interest_groups[ $interest_group_id ] ) ) { ?> selected="selected" <?php } } ?>>
+						<?php echo $field[ 'name' ]; ?>
 					</option>
 				<?php
 				}

admin/partials/menu/manage-forms.php

Spacing +59 added lines, -59 removed lines

@@ -10,12 +10,12 @@ 
 	$form_results = $wpdb->get_results( 'SELECT * FROM ' . $wpdb->prefix . 'yikes_easy_mc_forms', ARRAY_A );
 	
 	/* 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' ) {
 		/// Check for a transient, if not - set one up for one hour
 		if ( false === ( $list_data = get_transient( 'yikes-easy-mailchimp-list-data' ) ) ) {
-			$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
+			$api_key = trim( get_option( 'yikes-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( 
@@ -27,11 +27,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' ), "Manage Forms Page" );
+					$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data[ 'error' ], __( "Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ), "Manage Forms Page" );
 				}
 			} else {
 				// set our transient
@@ -44,28 +44,28 @@ 
 ?>
 <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
 		// Confirm that the necessary forms table in the database exists
-		if( $wpdb->get_var("show tables like '" . $wpdb->prefix . "yikes_easy_mc_forms'") != $wpdb->prefix . "yikes_easy_mc_forms" ) {
-			wp_die( '<div class="error"><p>' . __( 'It looks like the forms table is missing. Please de-activate and re-activate the plugin to attempt to create the table. If the error persists, please get in touch with the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' ) . '</p></div>' , 500 );
+		if ( $wpdb->get_var( "show tables like '" . $wpdb->prefix . "yikes_easy_mc_forms'" ) != $wpdb->prefix . "yikes_easy_mc_forms" ) {
+			wp_die( '<div class="error"><p>' . __( 'It looks like the forms table is missing. Please de-activate and re-activate the plugin to attempt to create the table. If the error persists, please get in touch with the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' ) . '</p></div>', 500 );
 		}
 	
 		/* 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>
@@ -73,7 +73,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>
@@ -81,7 +81,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>
@@ -89,7 +89,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>
@@ -97,7 +97,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>
@@ -124,13 +124,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 -->
@@ -139,72 +139,72 @@ 
 									<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 -->
 									
 									<!-- TABLE BODY -->
 									<tbody>
-										<?php if( count( $form_results ) > 0 ) { 
+										<?php if ( count( $form_results ) > 0 ) { 
 												$i = 1;
-												foreach( $form_results as $form ) { 
+												foreach ( $form_results as $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( $form['id'] ); ?></span></td>
+												<td class="column-columnname num"><span class="form-id-container"><?php echo intval( $form[ 'id' ] ); ?></span></td>
 												<td class="column-columnname">	
 													<!-- row title/link -->
-													<a href="<?php echo esc_url_raw( add_query_arg( array( 'id' => $form['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' => $form[ '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' => $form['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' => $form['id'] , 'nonce' => wp_create_nonce( 'duplicate-mailchimp-form-'.$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' => $form['id'] , 'nonce' => wp_create_nonce( 'reset-stats-mailchimp-form-'.$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' => $form[ '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' => $form[ 'id' ], 'nonce' => wp_create_nonce( 'duplicate-mailchimp-form-' . $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' => $form[ 'id' ], 'nonce' => wp_create_nonce( 'reset-stats-mailchimp-form-' . $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' , $form['id'] ); 
+															do_action( 'yikes-mailchimp-custom-form-actions', $form[ 'id' ] ); 
 														?>
-														<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-delete-form', 'mailchimp-form' => $form['id'] , 'nonce' => wp_create_nonce( 'delete-mailchimp-form-'.$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' => $form[ 'id' ], 'nonce' => wp_create_nonce( 'delete-mailchimp-form-' . $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="' . $form['id'] . '"]' ), $form['form_description'] ) : ''; ?></td>
-												<td class="column-columnname"><?php if( isset( $list_data ) && $list_data['total'] > 0 ) { $key = $this->findMCListID( $form['list_id'] , $list_data['data'] ); if( isset( $key ) ) { echo $list_data['data'][$key]['name']; } else { echo '<strong>' . __( 'List Not Found' , 'yikes-inc-easy-mailchimp-extender' ) . '</strong>'; } } ?></td>			
+												<td class="column-columnname"><?php echo isset( $form[ 'form_description' ] ) ? str_replace( '[yikes-mailchimp-subscriber-count]', do_shortcode( '[yikes-mailchimp-subscriber-count form="' . $form[ 'id' ] . '"]' ), $form[ 'form_description' ] ) : ''; ?></td>
+												<td class="column-columnname"><?php if ( isset( $list_data ) && $list_data[ 'total' ] > 0 ) { $key = $this->findMCListID( $form[ 'list_id' ], $list_data[ 'data' ] ); if ( isset( $key ) ) { echo $list_data[ 'data' ][ $key ][ 'name' ]; } else { echo '<strong>' . __( 'List Not Found', 'yikes-inc-easy-mailchimp-extender' ) . '</strong>'; } } ?></td>			
 												
 												<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)
@@ -213,12 +213,12 @@ 
 															$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 -->
 												<td class="column-columnname shortcode hidden-class" colspan="3">
-													<input type="text" class="yikes-mc-shortcode-input yikes-mc-shortcode-input-<?php echo $form['id']; ?>" onclick="this.setSelectionRange(0, this.value.length)" readonly value='[yikes-mailchimp form="<?php echo $form['id']; ?>"]' />
+													<input type="text" class="yikes-mc-shortcode-input yikes-mc-shortcode-input-<?php echo $form[ 'id' ]; ?>" onclick="this.setSelectionRange(0, this.value.length)" readonly value='[yikes-mailchimp form="<?php echo $form[ 'id' ]; ?>"]' />
 												</td>
 											</tr>
 										<?php 	
@@ -226,7 +226,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>
@@ -247,7 +247,7 @@ 
 						<div class="postbox yikes-easy-mc-postbox">
 																		
 							<?php 
-								$this->generate_manage_forms_sidebar( $list_data['data'] ); 
+								$this->generate_manage_forms_sidebar( $list_data[ 'data' ] ); 
 							?>
 														
 						</div> <!-- .postbox -->

Braces +4 added lines, -4 removed lines

@@ -27,7 +27,7 @@ 
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
 			$list_data = json_decode( wp_remote_retrieve_body( $list_data ), true );
-			if( isset( $list_data['error'] ) ) {	
+			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();
@@ -152,9 +152,9 @@ 
 									
 									<!-- TABLE BODY -->
 									<tbody>
-										<?php if( count( $form_results ) > 0 ) { 
+										<?php if( count( $form_results ) > 0 ) {
 												$i = 1;
-												foreach( $form_results as $form ) { 
+												foreach( $form_results as $form ) {
 										?>
 											<tr class="<?php if( $i % 2 == 0 ) { echo 'alternate'; } ?>">
 												<th class="check-column num" scope="row"><input type="checkbox" /></th>
@@ -202,7 +202,7 @@ 
 															$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' ) {
 																$conversion_color = '#FFFF32'; // yellow (ok)

admin/partials/menu/account-details.php

Spacing +57 added lines, -57 removed lines

@@ -1,12 +1,12 @@ 
 <?php 
 	// lets confirm the user has a valid API key stored
-	if( $this->is_user_mc_api_valid_form( false ) == 'valid' ) {
+	if ( $this->is_user_mc_api_valid_form( false ) == 'valid' ) {
 		// store the API key
-		$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
+		$api_key = trim( get_option( 'yikes-mc-api-key', '' ) );
 		$dash_position = strpos( $api_key, '-' );
 		/// Check for a transients, if not - set them up
 		if ( false === ( $profile_info = get_transient( 'yikes-easy-mailchimp-profile-data' ) ) ) {
-			if( $dash_position !== false ) {
+			if ( $dash_position !== false ) {
 				$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/users/profile.json';
 			}
 			$profile_info = wp_remote_post( $api_endpoint, array( 
@@ -17,11 +17,11 @@ 
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
 			$profile_info = json_decode( wp_remote_retrieve_body( $profile_info ), true );
-			if( isset( $profile_info['error'] ) ) {	
-				if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+			if ( isset( $profile_info[ '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( $profile_info['error'], __( "Get Profile Info." , 'yikes-inc-easy-mailchimp-extender' ), "Account Details Page" );
+					$error_logging->yikes_easy_mailchimp_write_to_error_log( $profile_info[ 'error' ], __( "Get Profile Info.", 'yikes-inc-easy-mailchimp-extender' ), "Account Details Page" );
 				}
 				return;
 			} else {
@@ -30,7 +30,7 @@ 
 			}
 		}
 		if ( false === ( $account_details = get_transient( 'yikes-easy-mailchimp-account-data' ) ) ) {
-			if( $dash_position !== false ) {
+			if ( $dash_position !== false ) {
 				$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/helper/account-details.json';
 			}
 			$account_details = wp_remote_post( $api_endpoint, array( 
@@ -41,11 +41,11 @@ 
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
 			$account_details = json_decode( wp_remote_retrieve_body( $account_details ), true );
-			if( isset( $account_details['error'] ) ) {	
-				if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+			if ( isset( $account_details[ '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_details['error'], __( "Get Account Details" , 'yikes-inc-easy-mailchimp-extender' ), "Account Details Page" );
+					$error_logging->yikes_easy_mailchimp_write_to_error_log( $account_details[ 'error' ], __( "Get Account Details", 'yikes-inc-easy-mailchimp-extender' ), "Account Details Page" );
 				}
 			} else {
 				// set our transient for one hour
@@ -54,7 +54,7 @@ 
 		}		
 		if ( false === ( $account_activity = get_transient( 'yikes-easy-mailchimp-account-activity' ) ) ) {
 			// retreive our list data
-			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( 
@@ -65,11 +65,11 @@ 
 				'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 Chimp Chatter" , 'yikes-inc-easy-mailchimp-extender' ), "Account Details Page" );
+					$error_logging->yikes_easy_mailchimp_write_to_error_log( $account_activity[ 'error' ], __( "Get Chimp Chatter", 'yikes-inc-easy-mailchimp-extender' ), "Account Details Page" );
 				}
 			} else {
 				// set our transient for one hour
@@ -77,16 +77,16 @@ 
 			}
 		}
 	} else {
-		wp_die( __( 'It looks like you need to re-validate your MailChimp API key before you can continue.' , 'yikes-inc-easy-mailchimp-extender' ) , 500 );
+		wp_die( __( 'It looks like you need to re-validate your MailChimp API key before you can continue.', 'yikes-inc-easy-mailchimp-extender' ), 500 );
 	}
 ?>
 <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 ' | ' . $profile_info['username']; ?></h1>		
+	<h1><?php _e( 'Account Overview', 'yikes-inc-easy-mailchimp-extender' ); echo ' | ' . $profile_info[ '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">
@@ -96,16 +96,16 @@ 
 					<!-- <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']));
-									switch( $activity['type'] ) {
+								foreach ( $account_activity as $activity ) {
+									$split_type = explode( ':', str_replace( '-', ' ', $activity[ 'type' ] ) );
+									switch ( $activity[ 'type' ] ) {
 										case 'lists:new-subscriber':
 										case 'lists:profile-updates':
 										case 'campaigns:facebook-likes':
@@ -123,60 +123,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
@@ -187,7 +187,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> -->
@@ -208,8 +208,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>
@@ -219,60 +219,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 $profile_info['name']; ?> <small>(<?php echo $profile_info['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 $profile_info[ 'name' ]; ?> <small>(<?php echo $profile_info[ '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 $account_details['contact']['company']; ?><br /><?php echo $account_details['contact']['city'] . ', ' . $account_details['contact']['state']; ?></td>
+									<td><?php echo $account_details[ 'contact' ][ 'company' ]; ?><br /><?php echo $account_details[ 'contact' ][ 'city' ] . ', ' . $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>
 							

Braces +4 added lines, -4 removed lines

@@ -17,7 +17,7 @@ 
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
 			$profile_info = json_decode( wp_remote_retrieve_body( $profile_info ), true );
-			if( isset( $profile_info['error'] ) ) {	
+			if( isset( $profile_info['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();
@@ -41,7 +41,7 @@ 
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
 			$account_details = json_decode( wp_remote_retrieve_body( $account_details ), true );
-			if( isset( $account_details['error'] ) ) {	
+			if( isset( $account_details['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();
@@ -65,7 +65,7 @@ 
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
 			$account_activity = json_decode( wp_remote_retrieve_body( $account_activity ), true );
-			if( isset( $account_activity['error'] ) ) {	
+			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();
@@ -148,7 +148,7 @@ 
 										</section>
 									<?php
 									} else {
-										if( $x == 7 ) {	
+										if( $x == 7 ) {
 											?>
 												<div id="hidden-chatter" class="yikes-easy-mc-hidden">
 											<?php