yikesinc / yikes-inc-easy-mailchimp-extender

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

admin/partials/menu/support.php

Spacing +12 added lines, -12 removed lines

@@ -10,17 +10,17 @@ 
 
 	<div id="yikes-mailchimp-logo" class="support-page"></div>
 	
-	<h1><?php _e( 'Support' , 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
-	<strong><?php _e( "You've got questions? We have answers!" , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-	<?php if( get_option( 'yikes-easy-mc-active-addons' , array() ) == array() ) { ?>
-		<p><?php _e( 'Users of the free version of YIKES Inc. Easy Forms for MailChimp are limited to two methods of support. We respond to support requests for the free version of the plugin once a week.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
-		<p><?php printf( __( 'Purchasers of our paid add-ons qualify for premium support, <a href="%s" target="_blank" title="' . __( 'check them out', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'check them out', 'yikes-inc-easy-mailchimp-extender' ) . '</a>!' , 'yikes-inc-easy-mailchimp-extender' ), esc_url( 'https://yikesplugins.com/' ) ); ?></p>
+	<h1><?php _e( 'Support', 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
+	<strong><?php _e( "You've got questions? We have answers!", 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+	<?php if ( get_option( 'yikes-easy-mc-active-addons', array() ) == array() ) { ?>
+		<p><?php _e( 'Users of the free version of YIKES Inc. Easy Forms for MailChimp are limited to two methods of support. We respond to support requests for the free version of the plugin once a week.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<p><?php printf( __( 'Purchasers of our paid add-ons qualify for premium support, <a href="%s" target="_blank" title="' . __( 'check them out', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'check them out', 'yikes-inc-easy-mailchimp-extender' ) . '</a>!', 'yikes-inc-easy-mailchimp-extender' ), esc_url( 'https://yikesplugins.com/' ) ); ?></p>
 	<?php } else { ?>
-		<p><?php _e( "It looks like you are one of our premium users! Fill out the form below to submit a priority support request." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
-		<p><?php _e( "If you have any problems with the form, send an email to <a href='mailto:support@yikesinc.com'>support@yikesinc.com</a> and a ticket will be created." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<p><?php _e( "It looks like you are one of our premium users! Fill out the form below to submit a priority support request.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<p><?php _e( "If you have any problems with the form, send an email to <a href='mailto:support@yikesinc.com'>support@yikesinc.com</a> and a ticket will be created.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 	<?php } ?>
 
-		<p><?php printf( __( 'Before submitting a support request, visit our %s.' , 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/' ) . '" title="' . __( 'Knowledge Base', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'knowledge base', 'yikes-inc-easy-mailchimp-extender' ) . '</a> where we have step-by-step guides and troubleshooting help.' ); ?></p>
+		<p><?php printf( __( 'Before submitting a support request, visit our %s.', 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/' ) . '" title="' . __( 'Knowledge Base', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'knowledge base', 'yikes-inc-easy-mailchimp-extender' ) . '</a> where we have step-by-step guides and troubleshooting help.' ); ?></p>
 
 	<hr />
 	
@@ -29,10 +29,10 @@ 
 		<div id="col-right">
 
 			<div class="col-wrap">
-				<h1><span class="github-octocat"></span><?php _e( 'Github Issue Tracker' , 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
+				<h1><span class="github-octocat"></span><?php _e( 'Github Issue Tracker', 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
 				<div class="inside">
 					<p><?php _e( 'The fastest way to receive free support is to submit a new issue to our GitHub issue tracker. ', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
-					<img class="support-page-logo" src="<?php echo YIKES_MC_URL; ?>includes/images/Support_Page/github-issue-screenshot.png" title="<?php esc_attr_e( 'Github Issue Tracker Screenshot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" >
+					<img class="support-page-logo" src="<?php echo YIKES_MC_URL; ?>includes/images/Support_Page/github-issue-screenshot.png" title="<?php esc_attr_e( 'Github Issue Tracker Screenshot', 'yikes-inc-easy-mailchimp-extender' ); ?>" >
 					<a href="https://github.com/yikesinc/yikes-inc-easy-mailchimp-extender/issues" target="_blank" class="button-secondary support-page-button"><?php _e( 'Submit New github.org Issue', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 				</div>
 			</div>
@@ -44,10 +44,10 @@ 
 		<div id="col-left">
 
 			<div class="col-wrap">
-				<h1><span class="dashicons dashicons-wordpress-alt support-page-wordpress-font"></span>&nbsp;<?php _e( 'WordPress.org Plugin Directory' , 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
+				<h1><span class="dashicons dashicons-wordpress-alt support-page-wordpress-font"></span>&nbsp;<?php _e( 'WordPress.org Plugin Directory', 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
 				<div class="inside">
 					<p><?php _e( 'Use your WordPress.org username to submit support requests on the WordPress Directory support forum.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
-					<img class="support-page-logo" src="<?php echo YIKES_MC_URL; ?>includes/images/Support_Page/wordpress-issue-screenshot.png" title="<?php esc_attr_e( 'WordPress.org Issue Tracker Screenshot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" >
+					<img class="support-page-logo" src="<?php echo YIKES_MC_URL; ?>includes/images/Support_Page/wordpress-issue-screenshot.png" title="<?php esc_attr_e( 'WordPress.org Issue Tracker Screenshot', 'yikes-inc-easy-mailchimp-extender' ); ?>" >
 					<a href="https://wordpress.org/support/plugin/yikes-inc-easy-mailchimp-extender" target="_blank" class="button-secondary support-page-button"><?php _e( 'Submit New WordPress.org Support Request', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 				</div>
 			</div>

admin/partials/menu/manage-lists.php

Spacing +23 added lines, -23 removed lines

@@ -1,11 +1,11 @@ 
 <?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( 
@@ -17,11 +17,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 Lists Page" );
+					$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data[ 'error' ], __( "Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ), "Manage Lists Page" );
 				}
 			} else {
 				// set our transient
@@ -32,17 +32,17 @@ 
 ?>
 <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' ) {
-			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 );
 		}
 	?>	
 		
@@ -63,8 +63,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 -->
@@ -72,25 +72,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( $list_data['total'] > 0 ) { 
+										<?php if ( $list_data[ 'total' ] > 0 ) { 
 												$i = 1;
-												foreach( $list_data['data'] as $list ) { 
+												foreach ( $list_data[ '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
@@ -100,14 +100,14 @@ 
 														?>
 													</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++;
 												}
 											} 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>

Braces +3 added lines, -3 removed lines

@@ -17,7 +17,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();
@@ -80,9 +80,9 @@ 
 									
 									<!-- TABLE BODY -->
 									<tbody>
-										<?php if( $list_data['total'] > 0 ) { 
+										<?php if( $list_data['total'] > 0 ) {
 												$i = 1;
-												foreach( $list_data['data'] as $list ) { 
+												foreach( $list_data['data'] as $list ) {
 										?>
 											<tr class="<?php if( $i % 2 == 0 ) { echo 'alternate'; } ?>">
 												<td class="column-columnname">

admin/partials/view-user.php

Spacing +77 added lines, -77 removed lines

@@ -3,24 +3,24 @@ 
 	*	Get and store our variables
 	*	@since 6.0
 	*/
-	$list_id = $_GET['mailchimp-list'];
-	$email_id = (int) esc_attr( $_GET['email-id'] );
+	$list_id = $_GET[ 'mailchimp-list' ];
+	$email_id = (int) esc_attr( $_GET[ 'email-id' ] );
 	
 	/*
 	*	Confirm that our data is set
 	*	or abort...
 	*/
-	if( ! isset( $list_id ) || ! isset( $email_id ) ) {
+	if ( ! isset( $list_id ) || ! isset( $email_id ) ) {
 		wp_die( "We've encountered an error. Please go back and try again", "yikes-inc-easy-mailchimp-extender" );
 		exit;
 	}
 	
 	// run our API call, to get 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, '-' );
 	
 	// get this lists data
-	if( $dash_position !== false ) {
+	if ( $dash_position !== false ) {
 		$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/member-info.json';
 	}
 	$user_data = wp_remote_post( $api_endpoint, array( 
@@ -36,29 +36,29 @@ 
 	) );
 	$user_data = json_decode( wp_remote_retrieve_body( $user_data ), true );	
 	
-	if( isset( $user_data['error'] ) ) {	
-		if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+	if ( isset( $user_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( $user_data['error'], __( "Get Member Info" , 'yikes-inc-easy-mailchimp-extender' ), "View User Page" );
+			$error_logging->yikes_easy_mailchimp_write_to_error_log( $user_data[ 'error' ], __( "Get Member Info", 'yikes-inc-easy-mailchimp-extender' ), "View User Page" );
 		}
 	}
 		
 	/*
 	*	Check for MailChimp returned errors
 	*/
-	if( isset( $user_data['error'] ) ) {
+	if ( isset( $user_data[ 'error' ] ) ) {
 		echo '<h4>Error</h4>';
-		echo $user_data['error'] . '.';
+		echo $user_data[ 'error' ] . '.';
 		return;
 	}	
 	
-	if( isset( $user_data['data'][0] ) ) {
+	if ( isset( $user_data[ 'data' ][ 0 ] ) ) {
 		// reset our data so we can easily use it
-		$user_data = $user_data['data'][0];
+		$user_data = $user_data[ 'data' ][ 0 ];
 		
-		$other_lists = ( isset( $user_data['lists'] ) && ! empty( $user_data['lists'] ) ) ? $user_data['lists'] : array();
-		$merge_data_array = ( $user_data['merges'] && ! empty( $user_data['merges'] ) ) ? $user_data['merges'] : array();
+		$other_lists = ( isset( $user_data[ 'lists' ] ) && ! empty( $user_data[ 'lists' ] ) ) ? $user_data[ 'lists' ] : array();
+		$merge_data_array = ( $user_data[ 'merges' ] && ! empty( $user_data[ 'merges' ] ) ) ? $user_data[ 'merges' ] : array();
 		
 		// print_r( $user_data );
 		
@@ -68,40 +68,40 @@ 
 		$merge_variable_fields = array();
 		
 		/* Build the array of mailing lists the user is subscribed to */
-		if( isset( $other_lists ) && count( $other_lists ) >= 1 ) {
-			foreach( $other_lists as $list ) {
-				if( $list['status'] == 'subscribed' ) {	
-					if( $dash_position !== false ) {
+		if ( isset( $other_lists ) && count( $other_lists ) >= 1 ) {
+			foreach ( $other_lists as $list ) {
+				if ( $list[ 'status' ] == 'subscribed' ) {	
+					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( 
 						'body' => array( 
 							'apikey' => $api_key, 
 							'filters' => array(
-								'list_id' => $list['id'] 
+								'list_id' => $list[ 'id' ] 
 							) 
 						),
 						'timeout' => 10,
 						'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' ), "View User Page" );
+							$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data[ 'error' ], __( "Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ), "View User Page" );
 						}
 					}
-					if( $list_data && isset( $list_data['data'][0] ) ) {
-						$additional_lists[$list_data['data'][0]['id']] = $list_data['data'][0]['name'];
+					if ( $list_data && isset( $list_data[ 'data' ][ 0 ] ) ) {
+						$additional_lists[ $list_data[ 'data' ][ 0 ][ 'id' ] ] = $list_data[ 'data' ][ 0 ][ 'name' ];
 					}
 				}
 			}	
 		}
 		
 		/* Build the array of merge variables => value */
-		if( isset( $merge_data_array ) && count( $merge_data_array ) >= 1 ) {
-			if( $dash_position !== false ) {
+		if ( isset( $merge_data_array ) && count( $merge_data_array ) >= 1 ) {
+			if ( $dash_position !== false ) {
 				$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/merge-vars.json';
 			}
 			$merge_variables = wp_remote_post( $api_endpoint, array( 
@@ -113,18 +113,18 @@ 
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
 			$merge_variables = json_decode( wp_remote_retrieve_body( $merge_variables ), true );
-			if( isset( $merge_variables['error'] ) ) {	
-				if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+			if ( isset( $merge_variables[ '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( $merge_variables['error'], __( "Get Merge Variables" , 'yikes-inc-easy-mailchimp-extender' ), "View User Page" );
+					$error_logging->yikes_easy_mailchimp_write_to_error_log( $merge_variables[ 'error' ], __( "Get Merge Variables", 'yikes-inc-easy-mailchimp-extender' ), "View User Page" );
 				}
 			}
 			// loop and display
-			if( $merge_variables ) {
-				foreach( $merge_variables['data'][0]['merge_vars'] as $merge_variable ) {
-					if( $merge_variable['tag'] != 'EMAIL' ) {					
-						$merge_variable_fields[$merge_variable['name']] = ( isset( $merge_data_array[$merge_variable['tag']] ) ) ? $merge_data_array[$merge_variable['tag']] : '';
+			if ( $merge_variables ) {
+				foreach ( $merge_variables[ 'data' ][ 0 ][ 'merge_vars' ] as $merge_variable ) {
+					if ( $merge_variable[ 'tag' ] != 'EMAIL' ) {					
+						$merge_variable_fields[ $merge_variable[ 'name' ] ] = ( isset( $merge_data_array[ $merge_variable[ 'tag' ] ] ) ) ? $merge_data_array[ $merge_variable[ 'tag' ] ] : '';
 					}
 				}
 			}
@@ -132,17 +132,17 @@ 
 		
 				
 		// store usable data
-		$user_email = sanitize_email( $user_data['email'] );
+		$user_email = sanitize_email( $user_data[ 'email' ] );
 		// prepend our email address to the beginning
 		$merge_variable_fields = array( 'Email Address' => $user_email ) + $merge_variable_fields;
 		$gravatar_image = get_avatar( $user_email, 120 );
-		$email_type = $user_data['email_type'];
-		$member_rating = ( ! empty( $user_data['member_rating'] ) ) ? (int) $user_data['member_rating'] : 0;
+		$email_type = $user_data[ 'email_type' ];
+		$member_rating = ( ! empty( $user_data[ 'member_rating' ] ) ) ? (int) $user_data[ 'member_rating' ] : 0;
 		$member_rating_stars = '';
-		if( $member_rating > 0 ) {
+		if ( $member_rating > 0 ) {
 			$x = 1;
-			while( $x <= 5 ) {
-				if( $x <= $member_rating ) {
+			while ( $x <= 5 ) {
+				if ( $x <= $member_rating ) {
 					$member_rating_stars .= '<span class="yikes-mc-member-rating-star dashicons dashicons-star-filled"></span>';
 				} else {
 					$member_rating_stars .= '<span class="yikes-mc-member-rating-star dashicons dashicons-star-empty"></span>';
@@ -151,25 +151,25 @@ 
 			}
 		} else {
 			$y = 1;
-			while( $y <= 5 ) {
+			while ( $y <= 5 ) {
 				$member_rating_stars .= '<span class="yikes-mc-member-rating-star dashicons dashicons-star-empty"></span>';
 				$y++;
 			}
 		}
-		$last_changed = strtotime( $user_data['info_changed'] );
-		$user_language = ( $user_data['language'] && $user_data['language'] != '' ) ? $user_data['language'] : '';
-		$list_name = $user_data['list_name'];
+		$last_changed = strtotime( $user_data[ 'info_changed' ] );
+		$user_language = ( $user_data[ 'language' ] && $user_data[ 'language' ] != '' ) ? $user_data[ 'language' ] : '';
+		$list_name = $user_data[ 'list_name' ];
 		
 		// Generate our display page
 		?>
 			<div class="wrap view-user-data-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( 'Subscriber Details' , 'yikes-inc-easy-mailchimp-extender' ); ?></h1>				
+				<h1>YIKES Easy Forms for MailChimp | <?php _e( 'Subscriber Details', 'yikes-inc-easy-mailchimp-extender' ); ?></h1>				
 						
 				<!-- Settings Page Description -->
-				<p class="yikes-easy-mc-about-text about-text"><?php printf( __( 'View %s subscriber details below.' , 'yikes-inc-easy-mailchimp-extender' ), $user_email ); ?></p>
+				<p class="yikes-easy-mc-about-text about-text"><?php printf( __( 'View %s subscriber details below.', 'yikes-inc-easy-mailchimp-extender' ), $user_email ); ?></p>
 					
 				<section class="yikes-mc-view-list-breadcrumbs">
 					<a href="<?php echo esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-lists' ) ); ?>" title="<?php _e( 'View List', 'yikes-inc-easy-mailchimp-extender' ); ?>">
@@ -192,16 +192,16 @@ 
 						<h2><?php echo $user_email; ?></h2>
 						<?php echo '<span class="member-star-rating-container" title="' . sprintf( _n( 'Member Rating: %s star', 'Member Rating: %s stars', $member_rating, 'yikes-inc-easy-mailchimp-extender' ), $member_rating ) . '">' . $member_rating_stars . '</span>'; ?>
 						<span class="member-subscription-date">
-							<?php echo __( 'Subscribed:', 'yikes-inc-easy-mailchimp-extender' ) . ' ' . get_date_from_gmt( $user_data['info_changed'], 'F jS, Y h:i a' ); ?>
+							<?php echo __( 'Subscribed:', 'yikes-inc-easy-mailchimp-extender' ) . ' ' . get_date_from_gmt( $user_data[ 'info_changed' ], 'F jS, Y h:i a' ); ?>
 						</span>
-						<?php if( isset( $user_data['geo'] ) && ! empty( $user_data['geo'] ) ) { ?>
-							<?php if( isset( $user_data['geo']['latitude'] ) && isset( $user_data['geo']['longitude'] ) ) { ?>
+						<?php if ( isset( $user_data[ 'geo' ] ) && ! empty( $user_data[ 'geo' ] ) ) { ?>
+							<?php if ( isset( $user_data[ 'geo' ][ 'latitude' ] ) && isset( $user_data[ 'geo' ][ 'longitude' ] ) ) { ?>
 								<span class="member-location-data">
-									<?php echo __( 'Location:', 'yikes-inc-easy-mailchimp-extender' ) . ' ' . yikes_mc_geocode_subscriber_data( $user_data['geo']['latitude'], $user_data['geo']['longitude'] ); ?>
+									<?php echo __( 'Location:', 'yikes-inc-easy-mailchimp-extender' ) . ' ' . yikes_mc_geocode_subscriber_data( $user_data[ 'geo' ][ 'latitude' ], $user_data[ 'geo' ][ 'longitude' ] ); ?>
 								</span>
 							<?php } else { ?>
 							<span class="member-location-data">
-								<?php echo __( 'Location:', 'yikes-inc-easy-mailchimp-extender' ) . ' ' . $user_data['geo']['region'] . ', ' . $user_data['geo']['cc']; ?>
+								<?php echo __( 'Location:', 'yikes-inc-easy-mailchimp-extender' ) . ' ' . $user_data[ 'geo' ][ 'region' ] . ', ' . $user_data[ 'geo' ][ 'cc' ]; ?>
 							</span>
 						<?php 
 								}
@@ -212,14 +212,14 @@ 
 					<hr class="yikes-mc-subscriber-hr" />
 					
 					<?php
-						if( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && $_GET['section'] == 'subscriber-data' ) ) { 	
+						if ( ! isset( $_GET[ 'section' ] ) || ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'subscriber-data' ) ) { 	
 							?>
 								<section class="yikes-mc-card-body merge-variable-section">
 								<h3><?php _e( 'Fields:', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
 								<?php
-									if( ! empty( $merge_variable_fields ) ) {	
+									if ( ! empty( $merge_variable_fields ) ) {	
 									?>
-										<?php foreach( $merge_variable_fields as $field_name => $value ) { ?>
+										<?php foreach ( $merge_variable_fields as $field_name => $value ) { ?>
 											<li>
 												<label>
 													<strong class="section-label"><?php echo $field_name; ?></strong>
@@ -232,11 +232,11 @@ 
 											<strong><?php _e( 'No Subscriber Data Found', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 										<?php
 									}
-									if( isset( $user_data['ip_signup'] ) && $user_data['ip_signup'] != '' ) {
+									if ( isset( $user_data[ 'ip_signup' ] ) && $user_data[ 'ip_signup' ] != '' ) {
 										?>
 											<li>
 												<label>
-													<strong class="section-label"><?php echo __( 'Signup IP', 'yikes-inc-easy-mailchimp-extender' ) . '</strong><p class="section-value"><em>' . $user_data['ip_signup']; ?></em></p>
+													<strong class="section-label"><?php echo __( 'Signup IP', 'yikes-inc-easy-mailchimp-extender' ) . '</strong><p class="section-value"><em>' . $user_data[ 'ip_signup' ]; ?></em></p>
 												</label>
 											</li>
 										<?php
@@ -247,17 +247,17 @@ 
 							<?php
 
 						
-						if( isset( $_GET['section'] ) && $_GET['section'] == 'additional-subscriptions' ) { 
+						if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'additional-subscriptions' ) { 
 							?>
 								<section class="yikes-mc-card-body">
 								<?php
-								if( ! empty( $additional_lists ) ) {	
+								if ( ! empty( $additional_lists ) ) {	
 									// remove this list from the additional lists list
-									unset( $additional_lists[$list_id] );
-									if( ! empty( $additional_lists ) ) {
+									unset( $additional_lists[ $list_id ] );
+									if ( ! empty( $additional_lists ) ) {
 										?>	
 										<h3><?php _e( 'Additional Subscriptions:', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
-										<?php foreach( $additional_lists as $listid => $name ) { ?>
+										<?php foreach ( $additional_lists as $listid => $name ) { ?>
 											<?php
 												$user_redirect_url = esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-view-list&list-id=' . $listid ) );
 											?>
@@ -276,8 +276,8 @@ 
 					?>
 					
 					<?php
-						if( isset( $_GET['section'] ) && $_GET['section'] == 'delete-subscriber' ) { 
-							$unsubscribe_subscriber_url = esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-unsubscribe-user', 'mailchimp-list' => $list_id , 'nonce' => wp_create_nonce( 'unsubscribe-user-'.$email_id ), 'email_id' => $email_id ) ) );
+						if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'delete-subscriber' ) { 
+							$unsubscribe_subscriber_url = esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-unsubscribe-user', 'mailchimp-list' => $list_id, 'nonce' => wp_create_nonce( 'unsubscribe-user-' . $email_id ), 'email_id' => $email_id ) ) );
 							?>	
 								<form id="delete_subscriber" method="POST" action="<?php echo $unsubscribe_subscriber_url; ?>">
 									<p class="description">
@@ -326,33 +326,33 @@ 
 				<div id="customer-tab-wrapper">
 						<ul id="customer-tab-wrapper-list">
 							
-							<?php if( isset( $_GET['section'] ) && $_GET['section'] != 'subscriber-data' ) { ?>
+							<?php if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] != 'subscriber-data' ) { ?>
 								<a title="<?php _e( 'Subscriber Details', 'yikes-inc-easy-mailchimp-extender' ); ?>" aria-label="<?php _e( 'Subscriber Details', 'yikes-inc-easy-mailchimp-extender' ); ?>" href="<?php echo $subscriber_details; ?>">
 							<?php } ?>
 							
-								<li <?php if( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && $_GET['section'] == 'subscriber-data' ) ) { ?>class="active"<?php } else { ?>class="inactive"<?php } ?>><span class="dashicons  dashicons-id"></span></li>
+								<li <?php if ( ! isset( $_GET[ 'section' ] ) || ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'subscriber-data' ) ) { ?>class="active"<?php } else { ?>class="inactive"<?php } ?>><span class="dashicons  dashicons-id"></span></li>
 										
-							<?php if( isset( $_GET['section'] ) && $_GET['section'] != 'subscriber-data' ) { ?>
+							<?php if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] != 'subscriber-data' ) { ?>
 								</a>
 							<?php } ?>
 							
-							<?php if( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && $_GET['section'] != 'additional-subscriptions' ) ) { ?>
+							<?php if ( ! isset( $_GET[ 'section' ] ) || ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] != 'additional-subscriptions' ) ) { ?>
 								<a title="<?php _e( 'Additional Subscriptions', 'yikes-inc-easy-mailchimp-extender' ); ?>" aria-label="<?php _e( 'Additional Subscriptions', 'yikes-inc-easy-mailchimp-extender' ); ?>" href="<?php echo $additional_subscription_url; ?>">
 							<?php } ?>
 								
-								<li <?php if( isset( $_GET['section'] ) && $_GET['section'] == 'additional-subscriptions' ) { ?>class="active"<?php } else { ?>class="inactive"<?php } ?>><span class="dashicons dashicons-portfolio"></span></li>
+								<li <?php if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'additional-subscriptions' ) { ?>class="active"<?php } else { ?>class="inactive"<?php } ?>><span class="dashicons dashicons-portfolio"></span></li>
 							
-							<?php if( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && $_GET['section'] == 'additional-subscriptions' ) ) { ?>
+							<?php if ( ! isset( $_GET[ 'section' ] ) || ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'additional-subscriptions' ) ) { ?>
 								</a>
 							<?php } ?>
 																
-							<?php if( ! isset( $_GET['section'] ) || isset( $_GET['section'] ) && $_GET['section'] != 'delete-subscriber' ) { ?>
+							<?php if ( ! isset( $_GET[ 'section' ] ) || isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] != 'delete-subscriber' ) { ?>
 								<a title="<?php _e( 'Delete Subscriber', 'yikes-inc-easy-mailchimp-extender' ); ?>" aria-label="<?php _e( 'Delete Subscriber', 'yikes-inc-easy-mailchimp-extender' ); ?>" href="<?php echo $delete_subscriber_url; ?>">
 							<?php } ?>
 							
-								<li <?php if( isset( $_GET['section'] ) && $_GET['section'] == 'delete-subscriber' ) { ?>class="active"<?php } else { ?>class="inactive"<?php } ?>><span class="dashicons dashicons-trash"></span></li>
+								<li <?php if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'delete-subscriber' ) { ?>class="active"<?php } else { ?>class="inactive"<?php } ?>><span class="dashicons dashicons-trash"></span></li>
 								
-							<?php if( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && $_GET['section'] == 'delete-subscriber' ) ) { ?>
+							<?php if ( ! isset( $_GET[ 'section' ] ) || ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'delete-subscriber' ) ) { ?>
 								</a>
 							<?php } ?>
 							
@@ -367,15 +367,15 @@ 
 	function yikes_mc_geocode_subscriber_data( $latitude, $longitude ) {
 		$geocode_url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng=' . $latitude . ',' . $longitude;
 		$geocode_response = wp_remote_get( $geocode_url );
-		if( is_wp_error( $geocode_response ) ) {
+		if ( is_wp_error( $geocode_response ) ) {
 			return;
 		}
 		$geocode_response_body = json_decode( wp_remote_retrieve_body( $geocode_response ), true );
-		if( is_wp_error( $geocode_response_body ) ) {
+		if ( is_wp_error( $geocode_response_body ) ) {
 			return;
 		}
-		$city = $geocode_response_body['results'][0]['address_components'][2]['short_name'];
-		$state = $geocode_response_body['results'][0]['address_components'][5]['short_name'];
-		$country = $geocode_response_body['results'][0]['address_components'][6]['short_name'];
+		$city = $geocode_response_body[ 'results' ][ 0 ][ 'address_components' ][ 2 ][ 'short_name' ];
+		$state = $geocode_response_body[ 'results' ][ 0 ][ 'address_components' ][ 5 ][ 'short_name' ];
+		$country = $geocode_response_body[ 'results' ][ 0 ][ 'address_components' ][ 6 ][ 'short_name' ];
 		return $link = '<a href="http://maps.google.com/maps?q=' . $latitude . ',' . $longitude . '" target="_blank" title="' . __( 'View Google Map', 'yikes-inc-easy-mailchimp-extender' ) . '">' . $city . ', ' . $state . ', ' . $country . '</a>&nbsp;<span class="flag-icon flag-icon-' . strtolower( $country ) . '"></span>';
 	}
\ No newline at end of file

Braces +10 added lines, -10 removed lines

@@ -36,7 +36,7 @@ 
 	) );
 	$user_data = json_decode( wp_remote_retrieve_body( $user_data ), true );	
 	
-	if( isset( $user_data['error'] ) ) {	
+	if( isset( $user_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();
@@ -70,7 +70,7 @@ 
 		/* Build the array of mailing lists the user is subscribed to */
 		if( isset( $other_lists ) && count( $other_lists ) >= 1 ) {
 			foreach( $other_lists as $list ) {
-				if( $list['status'] == 'subscribed' ) {	
+				if( $list['status'] == 'subscribed' ) {
 					if( $dash_position !== false ) {
 						$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/list.json';
 					}
@@ -85,7 +85,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();
@@ -113,7 +113,7 @@ 
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
 			$merge_variables = json_decode( wp_remote_retrieve_body( $merge_variables ), true );
-			if( isset( $merge_variables['error'] ) ) {	
+			if( isset( $merge_variables['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();
@@ -123,7 +123,7 @@ 
 			// loop and display
 			if( $merge_variables ) {
 				foreach( $merge_variables['data'][0]['merge_vars'] as $merge_variable ) {
-					if( $merge_variable['tag'] != 'EMAIL' ) {					
+					if( $merge_variable['tag'] != 'EMAIL' ) {
 						$merge_variable_fields[$merge_variable['name']] = ( isset( $merge_data_array[$merge_variable['tag']] ) ) ? $merge_data_array[$merge_variable['tag']] : '';
 					}
 				}
@@ -212,12 +212,12 @@ 
 					<hr class="yikes-mc-subscriber-hr" />
 					
 					<?php
-						if( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && $_GET['section'] == 'subscriber-data' ) ) { 	
+						if( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && $_GET['section'] == 'subscriber-data' ) ) {
 							?>
 								<section class="yikes-mc-card-body merge-variable-section">
 								<h3><?php _e( 'Fields:', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
 								<?php
-									if( ! empty( $merge_variable_fields ) ) {	
+									if( ! empty( $merge_variable_fields ) ) {
 									?>
 										<?php foreach( $merge_variable_fields as $field_name => $value ) { ?>
 											<li>
@@ -247,11 +247,11 @@ 
 							<?php
 
 						
-						if( isset( $_GET['section'] ) && $_GET['section'] == 'additional-subscriptions' ) { 
+						if( isset( $_GET['section'] ) && $_GET['section'] == 'additional-subscriptions' ) {
 							?>
 								<section class="yikes-mc-card-body">
 								<?php
-								if( ! empty( $additional_lists ) ) {	
+								if( ! empty( $additional_lists ) ) {
 									// remove this list from the additional lists list
 									unset( $additional_lists[$list_id] );
 									if( ! empty( $additional_lists ) ) {
@@ -276,7 +276,7 @@ 
 					?>
 					
 					<?php
-						if( isset( $_GET['section'] ) && $_GET['section'] == 'delete-subscriber' ) { 
+						if( isset( $_GET['section'] ) && $_GET['section'] == 'delete-subscriber' ) {
 							$unsubscribe_subscriber_url = esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-unsubscribe-user', 'mailchimp-list' => $list_id , 'nonce' => wp_create_nonce( 'unsubscribe-user-'.$email_id ), 'email_id' => $email_id ) ) );
 							?>	
 								<form id="delete_subscriber" method="POST" action="<?php echo $unsubscribe_subscriber_url; ?>">

admin/partials/helpers/init.php

Indentation +23 added lines, -23 removed lines

@@ -7,13 +7,13 @@ 
 	class Yikes_Inc_Easy_Mailchimp_Extender_Helper {
 	
 			/**
-			*	Helper functions to help out with extensions (still fleshing out)
-			*	@since 6.0
-			*	@ Parameters (array of data)
-			*		-	Section ID - id of the section, should be a slug style text ie: 'custom-section'
-			*		-	Link Text - Visible text for this link ie: 'Custom Section'
-			*		-	Dashicon - class of the icon you would like to use for this link
-			**/
+			 *	Helper functions to help out with extensions (still fleshing out)
+			 *	@since 6.0
+			 *	@ Parameters (array of data)
+			 *		-	Section ID - id of the section, should be a slug style text ie: 'custom-section'
+			 *		-	Link Text - Visible text for this link ie: 'Custom Section'
+			 *		-	Dashicon - class of the icon you would like to use for this link
+			 **/
 			public static function add_edit_form_section_link( $link_array=array() ) {
 				if( !empty( $link_array ) ) {
 					$link_data = wp_parse_args( array() , $link_array );
@@ -36,17 +36,17 @@ 
 			}
 			
 			/**
-			*	Helper functions to help out with extensions (still fleshing out)
-			*	@since 6.0
-			*	@ Parameters:
-			*		-	Section ID - id of the section, should be a slug style text ie: 'custom-section'
-			*		-	Class - class file to call function from?
-			*		-	Main Callback - call back for main section
-			*		-	Main Section Title - main section title
-			*		-	Sidebar Callback - callback for the sidebar section
-			*		-	Sidebar Title - title of the sidebar section
-			*		-	Class - class to reference funtions out of (optiona, if left blank functions should be defined in functions.php (or outside of a class))
-			**/
+			 *	Helper functions to help out with extensions (still fleshing out)
+			 *	@since 6.0
+			 *	@ Parameters:
+			 *		-	Section ID - id of the section, should be a slug style text ie: 'custom-section'
+			 *		-	Class - class file to call function from?
+			 *		-	Main Callback - call back for main section
+			 *		-	Main Section Title - main section title
+			 *		-	Sidebar Callback - callback for the sidebar section
+			 *		-	Sidebar Title - title of the sidebar section
+			 *		-	Class - class to reference funtions out of (optiona, if left blank functions should be defined in functions.php (or outside of a class))
+			 **/
 			public static function add_edit_form_section( $section_array=array() ) {
 				if( !empty( $section_array ) ) {
 					$section_data = wp_parse_args( array() , $section_array );
@@ -59,11 +59,11 @@ 
 			}
 			
 			/**
-			*	Check if the custom section is single or two columns (with sidebar)
-			*	@since 6.0
-			*	@Parameters:
-			*		-	Section Data - the array of data associated with the custom field you've set up
-			*/
+			 *	Check if the custom section is single or two columns (with sidebar)
+			 *	@since 6.0
+			 *	@Parameters:
+			 *		-	Section Data - the array of data associated with the custom field you've set up
+			 */
 			public static function is_custom_section_two_column( $custom_section_data ) {
 				// print_r( $custom_section_data );
 				$value = ( isset( $custom_section_data['sidebar_title'] ) && isset( $custom_section_data['sidebar_fields'] ) && !empty( $custom_section_data['sidebar_fields'] ) ) ?  true : false;

Spacing +13 added lines, -13 removed lines

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

admin/partials/helpers/fields/yikes-mailchimp-text-field.php

Spacing +5 added lines, -5 removed lines

@@ -5,12 +5,12 @@
 	*	For help on using, see our documentation [https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/]
 	* 	@since 6.0
 	*/
-	$field_data = json_decode( $form_data['custom_fields'] , true ); 
+	$field_data = json_decode( $form_data[ 'custom_fields' ], true ); 
 ?>
 <label class="custom-field-section">
-	<strong><?php echo $field['label']; ?></strong>
-	<input type="text" class="widefat" name="custom-field[<?php echo $field['id']; ?>]" id="custom-field" value="<?php echo isset( $field_data[$field['id']] ) ? $field_data[$field['id']] : ''; ?>" placeholder="<?php echo isset( $field['placeholder'] ) ? $field['placeholder'] : ''; ?>">
-	<?php if( isset( $field['description'] ) && $field['description'] != '' ) { ?>
-	<p class="description"><?php echo $field['description']; ?></p>
+	<strong><?php echo $field[ 'label' ]; ?></strong>
+	<input type="text" class="widefat" name="custom-field[<?php echo $field[ 'id' ]; ?>]" id="custom-field" value="<?php echo isset( $field_data[ $field[ 'id' ] ] ) ? $field_data[ $field[ 'id' ] ] : ''; ?>" placeholder="<?php echo isset( $field[ 'placeholder' ] ) ? $field[ 'placeholder' ] : ''; ?>">
+	<?php if ( isset( $field[ 'description' ] ) && $field[ 'description' ] != '' ) { ?>
+	<p class="description"><?php echo $field[ 'description' ]; ?></p>
 	<?php } ?>
 </label>
\ No newline at end of file

admin/partials/helpers/fields/yikes-mailchimp-select-field.php

Spacing +7 added lines, -7 removed lines

@@ -5,21 +5,21 @@
 	*	For help on using, see our documentation [https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/]
 	* 	@since 6.0
 	*/
-	$field_data = json_decode( $form_data['custom_fields'] , true ); 
+	$field_data = json_decode( $form_data[ 'custom_fields' ], true ); 
 ?>
 <div class="custom-field-section">
 	<!-- title -->
-	<strong><?php echo $field['label']; ?></strong>
+	<strong><?php echo $field[ 'label' ]; ?></strong>
 	
 	<!-- Dropdown -->
-	<select class="custom-select-field" name="custom-field[<?php echo $field['id']; ?>]">
-		<?php foreach( $field['options'] as $value => $label ) { ?>
-			<option value="<?php echo $value; ?>" <?php if( isset( $field_data[$field['id']] ) ) { selected( $field_data[$field['id']] , $value ); } ?>><?php echo $label; ?></option>
+	<select class="custom-select-field" name="custom-field[<?php echo $field[ 'id' ]; ?>]">
+		<?php foreach ( $field[ 'options' ] as $value => $label ) { ?>
+			<option value="<?php echo $value; ?>" <?php if ( isset( $field_data[ $field[ 'id' ] ] ) ) { selected( $field_data[ $field[ 'id' ] ], $value ); } ?>><?php echo $label; ?></option>
 		<?php } ?>
 	</select>
 	
 	<!-- description -->
-	<?php if( isset( $field['description'] ) && $field['description'] != '' ) { ?>
-		<p class="description"><?php echo $field['description']; ?></p>
+	<?php if ( isset( $field[ 'description' ] ) && $field[ 'description' ] != '' ) { ?>
+		<p class="description"><?php echo $field[ 'description' ]; ?></p>
 	<?php } ?>
 </div>
\ No newline at end of file

admin/partials/helpers/fields/yikes-mailchimp-wysiwyg-field.php

Spacing +6 added lines, -6 removed lines

@@ -6,13 +6,13 @@
 	*	For help on using, see our documentation [https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/]
 	* 	@since 6.0
 	*/
-	$field_data = json_decode( $form_data['custom_fields'] , true ); 
-	$content = ( isset( $field_data[$field['id']] ) ) ? $field_data[$field['id']] : ( isset( $field['default'] ) ? $field['default'] : '' );
-	$wysiwyg_id = 'custom-field['.$field['id'].']';
+	$field_data = json_decode( $form_data[ 'custom_fields' ], true ); 
+	$content = ( isset( $field_data[ $field[ 'id' ] ] ) ) ? $field_data[ $field[ 'id' ] ] : ( isset( $field[ 'default' ] ) ? $field[ 'default' ] : '' );
+	$wysiwyg_id = 'custom-field[' . $field[ 'id' ] . ']';
 ?>
 
 <div class="yikes-mailchimp-wysiwyg-field">
-    <label for="image_url" class="widefat"><strong><?php echo $field['label']; ?></strong></label>
-    <?php wp_editor( $content, $field['id'], array( 'textarea_name' => $wysiwyg_id ) ); ?>
-    <p class="description"><?php echo $field['description']; ?></p>
+    <label for="image_url" class="widefat"><strong><?php echo $field[ 'label' ]; ?></strong></label>
+    <?php wp_editor( $content, $field[ 'id' ], array( 'textarea_name' => $wysiwyg_id ) ); ?>
+    <p class="description"><?php echo $field[ 'description' ]; ?></p>
 </div>

admin/partials/helpers/fields/yikes-mailchimp-radio-field.php

Spacing +6 added lines, -6 removed lines

@@ -5,22 +5,22 @@
 	*	For help on using, see our documentation [https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/]
 	* 	@since 6.0
 	*/
-	$field_data = json_decode( $form_data['custom_fields'] , true ); 
+	$field_data = json_decode( $form_data[ 'custom_fields' ], true ); 
 ?>
 <div class="custom-field-section">
 	<!-- title -->
-	<strong><?php echo $field['label']; ?></strong>
+	<strong><?php echo $field[ 'label' ]; ?></strong>
 	<!-- radio buttons -->
 	<section class="custom-radio-holder">
-		<?php foreach( $field['options'] as $value => $label ) { ?>
+		<?php foreach ( $field[ 'options' ] as $value => $label ) { ?>
 			<label class="custom-radio-label">
-				<input type="radio" name="custom-field[<?php echo $field['id']; ?>][]" id="custom-field" value="<?php echo $value; ?>" <?php if( isset( $field_data[$field['id']] ) ) { checked( $field_data[$field['id']] , $value ); } ?>>
+				<input type="radio" name="custom-field[<?php echo $field[ 'id' ]; ?>][]" id="custom-field" value="<?php echo $value; ?>" <?php if ( isset( $field_data[ $field[ 'id' ] ] ) ) { checked( $field_data[ $field[ 'id' ] ], $value ); } ?>>
 				<?php echo $label; ?>
 			</label>
 		<?php } ?>
 	</section>
 	<!-- description -->
-	<?php if( isset( $field['description'] ) && $field['description'] != '' ) { ?>
-		<p class="description"><?php echo $field['description']; ?></p>
+	<?php if ( isset( $field[ 'description' ] ) && $field[ 'description' ] != '' ) { ?>
+		<p class="description"><?php echo $field[ 'description' ]; ?></p>
 	<?php } ?>
 </div>
\ No newline at end of file