yikesinc / yikes-inc-easy-mailchimp-extender

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

admin/partials/helpers/fields/yikes-mailchimp-checkbox-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="checkbox" class="widefat" name="custom-field[<?php echo $field['id']; ?>]" id="custom-field" value="1" <?php checked( isset( $field_data[$field['id']] ) ? $field_data[$field['id']] : 0, 1, true ); ?>>
-	<?php if( isset( $field['description'] ) && $field['description'] != '' ) { ?>
-	<p class="description"><?php echo $field['description']; ?></p>
+	<strong><?php echo $field[ 'label' ]; ?></strong>
+	<input type="checkbox" class="widefat" name="custom-field[<?php echo $field[ 'id' ]; ?>]" id="custom-field" value="1" <?php checked( isset( $field_data[ $field[ 'id' ] ] ) ? $field_data[ $field[ 'id' ] ] : 0, 1, true ); ?>>
+	<?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-file-field.php

Spacing +10 added lines, -10 removed lines

@@ -5,33 +5,33 @@
 	*	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 ); 
 	// This will enqueue the Media Uploader script
 	wp_enqueue_media();
 	// And let's not forget the script we wrote earlier
 	wp_enqueue_script( 'yikes-mailchimp-file-field-script', plugin_dir_url( __FILE__ ) . 'js/yikes-mc-file-upload.js', array( 'jquery' ), '1.0', false );
 	// print_r( $field_data );
-	wp_localize_script( 'yikes-mailchimp-file-field-script' , 'additional_data' , array(
+	wp_localize_script( 'yikes-mailchimp-file-field-script', 'additional_data', array(
 		'wp_includes_image_url' => includes_url() . 'images/media/'
 	) );
 	$i = 1;
 	// create an single item array when nothing is stored yet, loop for one field 
-	$field_data['incentive-attachment'] = ( isset( $field_data['incentive-attachment'] ) && !empty( $field_data['incentive-attachment'] ) )  ? $field_data['incentive-attachment'] : array( '' );
+	$field_data[ 'incentive-attachment' ] = ( isset( $field_data[ 'incentive-attachment' ] ) && ! empty( $field_data[ 'incentive-attachment' ] ) ) ? $field_data[ 'incentive-attachment' ] : array( '' );
 ?>
 	
 	<div class="yikes-mailchimp-file-field">
-		<label for="image_url" class="widefat"><strong><?php echo $field['label']; ?></strong></label>
-		<?php foreach( $field_data['incentive-attachment'] as $attachment ) { ?>
-			<input type="text" name="custom-field[<?php echo $field['id']; ?>][<?php echo $i; ?>]" id="custom-field[<?php echo $field['id']; ?>][<?php echo $i; ?>]" class="file-attachment" value="<?php echo isset( $field_data[$field['id']][$i] ) ? $field_data[$field['id']][$i] : ''; ?>">
-			<input type="button" name="upload-btn" id="upload-btn" class="button-secondary" data-attr-position="<?php echo $i; ?>" value="<?php _e( 'Upload File' , 'yikes-inc-easy-mailchimp-extender' ); ?>">
+		<label for="image_url" class="widefat"><strong><?php echo $field[ 'label' ]; ?></strong></label>
+		<?php foreach ( $field_data[ 'incentive-attachment' ] as $attachment ) { ?>
+			<input type="text" name="custom-field[<?php echo $field[ 'id' ]; ?>][<?php echo $i; ?>]" id="custom-field[<?php echo $field[ 'id' ]; ?>][<?php echo $i; ?>]" class="file-attachment" value="<?php echo isset( $field_data[ $field[ 'id' ] ][ $i ] ) ? $field_data[ $field[ 'id' ] ][ $i ] : ''; ?>">
+			<input type="button" name="upload-btn" id="upload-btn" class="button-secondary" data-attr-position="<?php echo $i; ?>" value="<?php _e( 'Upload File', 'yikes-inc-easy-mailchimp-extender' ); ?>">
 			<div class="file-container">
 				<p class="file-remove-wrapper">
-					<a href="#" class="remove-file-button" data-attr-position="<?php echo $i; ?>"><?php _e( 'Remove File' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+					<a href="#" class="remove-file-button" data-attr-position="<?php echo $i; ?>"><?php _e( 'Remove File', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 				</p>
 			</div>
 		<?php $i++; } ?>
-		<?php if( isset( $field['repeat'] ) ) { ?>
+		<?php if ( isset( $field[ 'repeat' ] ) ) { ?>
 			<a href="#" class="button-secondary add-new-incentive-attachment" data-attr-position="<?php echo $i; ?>"><span class="dashicons dashicons-plus"></span></a>
 		<?php } ?>
-		<p class="description"><?php echo $field['description']; ?></p>
+		<p class="description"><?php echo $field[ 'description' ]; ?></p>
 	</div>
\ No newline at end of file