yikesinc / yikes-inc-easy-mailchimp-extender

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

admin/partials/helpers/knowledge-base-articles-RSS.php

Spacing +4 added lines, -4 removed lines

@@ -41,8 +41,8 @@ 
 		*	Loop over all of our queries set above
 		*	@sicne 6.0.3.8
 		*/
-		foreach( $kb_queries as $article_title => $rss_feed_url ) {
-			$page = ( isset( $_GET['page'] ) ) ? $_GET['page'] : 'yikes-inc-easy-mailchimp-support';
+		foreach ( $kb_queries as $article_title => $rss_feed_url ) {
+			$page = ( isset( $_GET[ 'page' ] ) ) ? $_GET[ 'page' ] : 'yikes-inc-easy-mailchimp-support';
 			/* Create the SimplePie object */
 			$article_feed = new SimplePie(); 
 			$article_feed->enable_cache( true ); // temporary
@@ -64,11 +64,11 @@ 
 				return $article_feed = new WP_Error( 'simplepie-error', $article_feed->error() );
 			}
 			// loop over latest items
-			if( $article_feed->get_items() ) {
+			if ( $article_feed->get_items() ) {
 				?><ul class="knowledge-base-listing">
 					<li class="list-title"><?php echo $article_title; ?></li>
 				<?php
-					foreach( $article_feed->get_items( 0, 5 ) as $kb_article ) {
+					foreach ( $article_feed->get_items( 0, 5 ) as $kb_article ) {
 						// store the description
 						$description_pre_split = $kb_article->get_description();
 						$kb_article_permalink = esc_url_raw( $kb_article->get_permalink() );

admin/partials/helpers/edit-form-hidden-section-template.php

Spacing +21 added lines, -21 removed lines

@@ -8,28 +8,28 @@ 
 		// grab our global form_data;
 		global $form_data;
 	?>
-	<label class="hidden-setting-label yikes-easy-mc-hidden" for="form" id=<?php esc_attr_e( $section_data['id'] ); ?>>
+	<label class="hidden-setting-label yikes-easy-mc-hidden" for="form" id=<?php esc_attr_e( $section_data[ 'id' ] ); ?>>
 		<div id="poststuff">
-			<div id="post-body" class="metabox-holder <?php if( self::is_custom_section_two_column( $section_data ) ) { ?> columns-2 <?php } else { ?> columns-1 <?php } ?>">
+			<div id="post-body" class="metabox-holder <?php if ( self::is_custom_section_two_column( $section_data ) ) { ?> columns-2 <?php } else { ?> columns-1 <?php } ?>">
 				<div id="post-body-content">
 					<div class="meta-box-sortables ui-sortable">
 						<div class="postbox yikes-easy-mc-postbox">
-							<h3 class="edit-form-title"><span><?php echo $section_data['main_title']; ?></span></h3>
-								<div class="inside <?php esc_attr_e( $section_data['id'] ); ?>-container">
+							<h3 class="edit-form-title"><span><?php echo $section_data[ 'main_title' ]; ?></span></h3>
+								<div class="inside <?php esc_attr_e( $section_data[ 'id' ] ); ?>-container">
 									<?php 
-										if( isset( $section_data['main_description'] ) && $section_data['main_description'] != '' ) {
+										if ( isset( $section_data[ 'main_description' ] ) && $section_data[ 'main_description' ] != '' ) {
 											?>
-												<p><?php echo $section_data['main_description']; ?></p>
+												<p><?php echo $section_data[ 'main_description' ]; ?></p>
 											<?php
 										}
-										$main_field_data = $section_data['main_fields'];
-										foreach( $main_field_data as $field ) { 
-											if( $field['type'] == 'custom' ) {
+										$main_field_data = $section_data[ 'main_fields' ];
+										foreach ( $main_field_data as $field ) { 
+											if ( $field[ 'type' ] == 'custom' ) {
 												// execute the custom callback
-												$field['callback']();
+												$field[ 'callback' ]();
 											} else {
 												// include our field files
-												include( YIKES_MC_PATH . 'admin/partials/helpers/fields/yikes-mailchimp-' . $field['type'] . '-field.php' );
+												include( YIKES_MC_PATH . 'admin/partials/helpers/fields/yikes-mailchimp-' . $field[ 'type' ] . '-field.php' );
 											}
 										}
 									?>
@@ -39,27 +39,27 @@ 
 					</div>
 					
 					<!-- check for single/double box -->
-					<?php if( self::is_custom_section_two_column( $section_data ) ) { ?>
+					<?php if ( self::is_custom_section_two_column( $section_data ) ) { ?>
 						<!-- begin sidebar -->
 						<div id="postbox-container-1" class="postbox-container">
 							<div class="meta-box-sortables">
 								<div class="postbox yikes-easy-mc-postbox">
-									<h3 class="edit-form-title"><span><?php echo $section_data['sidebar_title']; ?></span></h3>
-									<div class="inside <?php esc_attr_e( $section_data['id'] ); ?>-sidebar-container"> 
+									<h3 class="edit-form-title"><span><?php echo $section_data[ 'sidebar_title' ]; ?></span></h3>
+									<div class="inside <?php esc_attr_e( $section_data[ 'id' ] ); ?>-sidebar-container"> 
 										<?php
-											if( isset( $section_data['sidebar_description'] ) && $section_data['sidebar_description'] != '' ) {
+											if ( isset( $section_data[ 'sidebar_description' ] ) && $section_data[ 'sidebar_description' ] != '' ) {
 												?>
-													<p><?php echo $section_data['sidebar_description']; ?></p>
+													<p><?php echo $section_data[ 'sidebar_description' ]; ?></p>
 												<?php
 											}
-											$sidebar_field_data = $section_data['sidebar_fields'];
-											foreach( $sidebar_field_data as $field ) { 
-												if( $field['type'] == 'custom' ) {
+											$sidebar_field_data = $section_data[ 'sidebar_fields' ];
+											foreach ( $sidebar_field_data as $field ) { 
+												if ( $field[ 'type' ] == 'custom' ) {
 													// execute the custom callback
-													$field['callback']();
+													$field[ 'callback' ]();
 												} else {
 													// include our field files
-													include( YIKES_MC_PATH . 'admin/partials/helpers/fields/yikes-mailchimp-' . $field['type'] . '-field.php' );
+													include( YIKES_MC_PATH . 'admin/partials/helpers/fields/yikes-mailchimp-' . $field[ 'type' ] . '-field.php' );
 												}
 											}
 										?>

admin/partials/front-end-widgets/front-end-widget-form.php

Spacing +26 added lines, -26 removed lines

@@ -14,7 +14,7 @@ 
 			// Widget name will appear in UI
 			__( 'Easy MailChimp Forms', 'yikes-inc-easy-mailchimp-extender' ), 
 			// Widget description
-			array( 'description' => __( 'MailChimp opt-in widget for your sidebar.', 'yikes-inc-easy-mailchimp-extender' ), ) 
+			array( 'description' => __( 'MailChimp opt-in widget for your sidebar.', 'yikes-inc-easy-mailchimp-extender' ),) 
 		);
 		
 	}
@@ -27,41 +27,41 @@ 
 		global $wpdb;
 		$form_results = $wpdb->get_results( 'SELECT * FROM ' . $wpdb->prefix . 'yikes_easy_mc_forms LIMIT 1', ARRAY_A );
 		
-		$title = isset( $instance['title'] ) ? apply_filters( 'widget_title', $instance['title'] ) : __( 'MailChimp Signup Form', 'yikes-inc-easy-mailchimp-extender' );
-		$form_id = isset( $instance['form_id'] ) ? $instance['form_id'] : $form_results[0]['id'];
-		$form_description = isset( $instance['form_description'] ) ? $instance['form_description'] : '';
-		$submit_button_text = isset( $instance['submit_text'] ) ? $instance['submit_text'] : __( 'Submit' , 'yikes-inc-easy-mailchimp-extender' );
+		$title = isset( $instance[ 'title' ] ) ? apply_filters( 'widget_title', $instance[ 'title' ] ) : __( 'MailChimp Signup Form', 'yikes-inc-easy-mailchimp-extender' );
+		$form_id = isset( $instance[ 'form_id' ] ) ? $instance[ 'form_id' ] : $form_results[ 0 ][ 'id' ];
+		$form_description = isset( $instance[ 'form_description' ] ) ? $instance[ 'form_description' ] : '';
+		$submit_button_text = isset( $instance[ 'submit_text' ] ) ? $instance[ 'submit_text' ] : __( 'Submit', 'yikes-inc-easy-mailchimp-extender' );
 		
 		$shortcode_attributes = array();
 		// Build our array based on settings chosen
-		$sortcode_attributes[] = 'form="' . $form_id .'"';
+		$sortcode_attributes[ ] = 'form="' . $form_id . '"';
 		// form description
-		if( !empty( $form_description ) ) {
-			$sortcode_attributes[] = 'description="1"';
+		if ( ! empty( $form_description ) ) {
+			$sortcode_attributes[ ] = 'description="1"';
 		}
 		// submit button text
-		$sortcode_attributes[] = 'submit="' . $submit_button_text .'"';
+		$sortcode_attributes[ ] = 'submit="' . $submit_button_text . '"';
 		
 		// before and after widget arguments are defined by themes
-		echo $args['before_widget'];
+		echo $args[ 'before_widget' ];
 		
 			if ( ! empty( $title ) )
-				echo $args['before_title'] . $title . $args['after_title'];
+				echo $args[ 'before_title' ] . $title . $args[ 'after_title' ];
 				
 			// Custom action hooks to place content in the widget before the form
 			// See FAQ for examples on usage
-			do_action( 'yikes-mailchimp-before-form-'.$form_id );
+			do_action( 'yikes-mailchimp-before-form-' . $form_id );
 			do_action( 'yikes-mailchimp-before-form' );
 			
 			// This is where you run the code and display the output
-			echo do_shortcode( '[yikes-mailchimp ' . implode( ' ' , $sortcode_attributes ) . ']' );
+			echo do_shortcode( '[yikes-mailchimp ' . implode( ' ', $sortcode_attributes ) . ']' );
 			
 			// Custom action hooks to place content in the widget after the form
 			// See FAQ for examples on usage
-			do_action( 'yikes-mailchimp-after-form-'.$form_id );
+			do_action( 'yikes-mailchimp-after-form-' . $form_id );
 			do_action( 'yikes-mailchimp-after-form' );
 		
-		echo $args['after_widget'];
+		echo $args[ 'after_widget' ];
 		
 	}
 			
@@ -72,10 +72,10 @@ 
 		global $wpdb;
 		$form_results = $wpdb->get_results( 'SELECT * FROM ' . $wpdb->prefix . 'yikes_easy_mc_forms', ARRAY_A );
 	
-		if( empty( $form_results ) ) {
+		if ( empty( $form_results ) ) {
 			?>
 				<section class="no-forms-widget">
-				<strong><span class="dashicons dashicons-no-alt no-forms-found-icon"></span><?php echo sprintf( __( 'No forms found. It looks like you need to <a href="%s" title="%s">%s</a>.', 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ), __( 'Create a form' , 'yikes-inc-easy-mailchimp-extender' ), __( 'create a form' , 'yikes-inc-easy-mailchimp-extender' ) ); ?></strong>
+				<strong><span class="dashicons dashicons-no-alt no-forms-found-icon"></span><?php echo sprintf( __( 'No forms found. It looks like you need to <a href="%s" title="%s">%s</a>.', 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ), __( 'Create a form', 'yikes-inc-easy-mailchimp-extender' ), __( 'create a form', 'yikes-inc-easy-mailchimp-extender' ) ); ?></strong>
 				</section>
 			<?php
 			return;
@@ -102,9 +102,9 @@ 
 				$submit_text = __( 'Submit', 'yikes-inc-easy-mailchimp-extender' );
 			}
 			
-			 if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) == 'invalid_api_key' ) {
+			 if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
 				?>
-					<p class="enter-valid-api-error-widget"><strong><?php _e( 'Please enter a valid MailChimp API key to connect your site to MailChimp.' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
+					<p class="enter-valid-api-error-widget"><strong><?php _e( 'Please enter a valid MailChimp API key to connect your site to MailChimp.', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
 				<?php
 				return;
 			}
@@ -121,9 +121,9 @@ 
 				<select id="<?php echo $this->get_field_id( 'form_id' ); ?>" name="<?php echo $this->get_field_name( 'form_id' ); ?>" class="widefat">
 					<?php 
 					// build our array
-					foreach( $form_results as $form ) {
+					foreach ( $form_results as $form ) {
 						?>
-							<option <?php selected( $selected_form , $form['id'] ); ?> name="<?php echo $this->get_field_name( 'form_id' ); ?>" value="<?php echo $form['id']; ?>"><?php echo stripslashes( $form['form_name'] ); ?></option>
+							<option <?php selected( $selected_form, $form[ 'id' ] ); ?> name="<?php echo $this->get_field_name( 'form_id' ); ?>" value="<?php echo $form[ 'id' ]; ?>"><?php echo stripslashes( $form[ 'form_name' ] ); ?></option>
 						<?php
 					}
 					?>
@@ -132,7 +132,7 @@ 
 		
 			<p>
 				<label for="<?php echo $this->get_field_id( 'form_description' ); ?>"><?php _e( 'Display Form Description:' ); ?></label> 
-				<input class="widefat" id="<?php echo $this->get_field_id( 'form_description' ); ?>" name="<?php echo $this->get_field_name( 'form_description' ); ?>" type="checkbox" value="1" <?php if( isset( $instance['form_description'] ) ) { checked( $instance['form_description'] , 1 ); } ?> />
+				<input class="widefat" id="<?php echo $this->get_field_id( 'form_description' ); ?>" name="<?php echo $this->get_field_name( 'form_description' ); ?>" type="checkbox" value="1" <?php if ( isset( $instance[ 'form_description' ] ) ) { checked( $instance[ 'form_description' ], 1 ); } ?> />
 			</p>
 			
 			<p>
@@ -145,10 +145,10 @@ 
 	// Updating widget replacing old instances with new
 	public function update( $new_instance, $old_instance ) {
 		$instance = array();
-		$instance['title'] = ( ! empty( $new_instance['title'] ) ) ? strip_tags( $new_instance['title'] ) : '';
-		$instance['form_id'] = $new_instance['form_id'];
-		$instance['form_description'] = isset( $new_instance['form_description'] ) ? '1' : '';
-		$instance['submit_text'] = ( ! empty( $new_instance['submit_text'] ) ) ? strip_tags( $new_instance['submit_text'] ) : 'Submit';
+		$instance[ 'title' ] = ( ! empty( $new_instance[ 'title' ] ) ) ? strip_tags( $new_instance[ 'title' ] ) : '';
+		$instance[ 'form_id' ] = $new_instance[ 'form_id' ];
+		$instance[ 'form_description' ] = isset( $new_instance[ 'form_description' ] ) ? '1' : '';
+		$instance[ 'submit_text' ] = ( ! empty( $new_instance[ 'submit_text' ] ) ) ? strip_tags( $new_instance[ 'submit_text' ] ) : 'Submit';
 		return $instance;
 	}
 	

admin/partials/view-list.php

Spacing +107 added lines, -107 removed lines

@@ -1,9 +1,9 @@ 
 <?php
-	if( isset( $_REQUEST['list-id'] ) ) {	
-		$list_id = sanitize_key( $_REQUEST['list-id'] );
-		$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );		
+	if ( isset( $_REQUEST[ 'list-id' ] ) ) {	
+		$list_id = sanitize_key( $_REQUEST[ 'list-id' ] );
+		$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( 
@@ -15,40 +15,40 @@ 
 			'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 Lists Page" );
+				$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data[ 'error' ], __( "Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ), "View Lists Page" );
 			}
 		}
 		// reset our data so we can easily use it
-		$list_data = $list_data['data'][0];
+		$list_data = $list_data[ 'data' ][ 0 ];
 		
-		if( $dash_position !== false ) {
+		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( 
 			'body' => array( 
 				'apikey' => $api_key, 
-				'id' => array( $list_id ) ,
+				'id' => array( $list_id ),
 			),
 			'timeout' => 10,
 			'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 Lists Page" );
+				$error_logging->yikes_easy_mailchimp_write_to_error_log( $merge_variables[ 'error' ], __( "Get Merge Variables", 'yikes-inc-easy-mailchimp-extender' ), "View Lists Page" );
 			}
 		}
 		// re-store our data
-		$merge_variables = $merge_variables['data'][0]['merge_vars'];
+		$merge_variables = $merge_variables[ 'data' ][ 0 ][ 'merge_vars' ];
 		
 		// get the interest group data
-		if( $dash_position !== false ) {
+		if ( $dash_position !== false ) {
 			$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/interest-groupings.json';
 		}
 		$interest_groupings = wp_remote_post( $api_endpoint, array( 
@@ -62,20 +62,20 @@ 
 		) );
 		$interest_groupings = json_decode( wp_remote_retrieve_body( $interest_groupings ), true );
 		
-		if( isset( $interest_groupings['error'] ) ) {	
-			if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+		if ( isset( $interest_groupings[ '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( $interest_groupings['error'], __( "Get Interest Groups" , 'yikes-inc-easy-mailchimp-extender' ), "View Lists Page" );
+				$error_logging->yikes_easy_mailchimp_write_to_error_log( $interest_groupings[ 'error' ], __( "Get Interest Groups", 'yikes-inc-easy-mailchimp-extender' ), "View Lists Page" );
 			}
 		}
 	
 		$no_interest_groupings = '<p class="description">' . __( 'Interest groups are not enabled for this list.', 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
 		
 		
-		$no_segments = __( 'No segments set up for this list.' , 'yikes-inc-easy-mailchimp-extender' );
+		$no_segments = __( 'No segments set up for this list.', 'yikes-inc-easy-mailchimp-extender' );
 		// get the segment data
-		if( $dash_position !== false ) {
+		if ( $dash_position !== false ) {
 			$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/segments.json';
 		}
 		$segments = wp_remote_post( $api_endpoint, array( 
@@ -90,14 +90,14 @@ 
 		
 		
 		// setup pagination variables
-		$paged = isset( $_REQUEST['paged'] ) ? $_REQUEST['paged'] : '0';
+		$paged = isset( $_REQUEST[ 'paged' ] ) ? $_REQUEST[ 'paged' ] : '0';
 		
-		$limit = apply_filters( 'yikes_admin_list_subscriber_limit' , '20' );
+		$limit = apply_filters( 'yikes_admin_list_subscriber_limit', '20' );
 		
-		$sort_dir = isset( $_REQUEST['sort'] ) ? $_REQUEST['sort'] : 'DESC';
-		$column = isset( $_REQUEST['column'] ) ? $_REQUEST['column'] : 'optin_time';
+		$sort_dir = isset( $_REQUEST[ 'sort' ] ) ? $_REQUEST[ 'sort' ] : 'DESC';
+		$column = isset( $_REQUEST[ 'column' ] ) ? $_REQUEST[ 'column' ] : 'optin_time';
 		
-		if( $sort_dir == 'DESC' ) {
+		if ( $sort_dir == 'DESC' ) {
 			$opposite_sort_dir = 'ASC';
 			$icon = '<span class="dashicons dashicons-arrow-down"></span>';
 		} else {
@@ -105,12 +105,12 @@ 
 			$icon = '<span class="dashicons dashicons-arrow-up"></span>';
 		}
 		
-		if( !isset( $_REQUEST['sort'] ) ) {	
+		if ( ! isset( $_REQUEST[ 'sort' ] ) ) {	
 			$icon = '';
 		}
 		
 		// get all subscribed members
-		if( $dash_position !== false ) {
+		if ( $dash_position !== false ) {
 			$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/members.json';
 		}
 		$subscribers_list = wp_remote_post( $api_endpoint, array( 
@@ -128,16 +128,16 @@ 
 			'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true ),
 		) );
 		$subscribers_list = json_decode( wp_remote_retrieve_body( $subscribers_list ), true );	
-		if( isset( $subscribers_list['error'] ) ) {	
-			if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+		if ( isset( $subscribers_list[ '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( $subscribers_list['error'], __( "Get Subscriber Count" , 'yikes-inc-easy-mailchimp-extender' ), "View Lists Page" );
+				$error_logging->yikes_easy_mailchimp_write_to_error_log( $subscribers_list[ 'error' ], __( "Get Subscriber Count", 'yikes-inc-easy-mailchimp-extender' ), "View Lists Page" );
 			}
 		}
 		
-		$total_pages = ceil( $subscribers_list['total'] / $limit );
-		if( $total_pages == 0 ) {
+		$total_pages = ceil( $subscribers_list[ 'total' ] / $limit );
+		if ( $total_pages == 0 ) {
 			$total_pages = '1';
 		}
 		
@@ -146,25 +146,25 @@ 
 ?>
 <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 echo $list_data['name']; ?></h1>				
+	<h1>YIKES Easy Forms for MailChimp | <?php echo $list_data[ 'name' ]; ?></h1>				
 		
 	<!-- Settings Page Description -->
-	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'View all subscribers below. View additional subscriber info, or add additional fields to this list.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
-	<!-- <p class="add-new-subscriber-button"><a href="#" onclick="jQuery(this).parent().next().slideToggle();" class="add-new-h2"><?php _e( 'New Subscriber' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></p> -->
+	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'View all subscribers below. View additional subscriber info, or add additional fields to this list.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+	<!-- <p class="add-new-subscriber-button"><a href="#" onclick="jQuery(this).parent().next().slideToggle();" class="add-new-h2"><?php _e( 'New Subscriber', 'yikes-inc-easy-mailchimp-extender' ); ?></a></p> -->
 	
 	<?php
 		/* Display our admin notices here */
 		// Unsubscribe user confirmation message
-		if( isset( $_REQUEST['user-unsubscribed'] ) && $_REQUEST['user-unsubscribed'] == 'true' ) {
+		if ( isset( $_REQUEST[ 'user-unsubscribed' ] ) && $_REQUEST[ 'user-unsubscribed' ] == 'true' ) {
 			?>
 			<div class="updated manage-form-admin-notice">
 				<p><?php _e( 'User successfully unsubscribed.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 			</div>
 			<?php
 		}
-		if( isset( $_REQUEST['user-unsubscribed'] ) && $_REQUEST['user-unsubscribed'] == 'false' ) {
+		if ( isset( $_REQUEST[ 'user-unsubscribed' ] ) && $_REQUEST[ 'user-unsubscribed' ] == 'false' ) {
 			?>
 			<div class="error manage-form-admin-notice">
 				<p><?php _e( "We've encountered an error trying to remove the subscriber. Please try again. If the error persists please get in contact with the YIKES Inc. support staff.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -174,9 +174,9 @@ 
 	?>
 	
 	<section class="add-new-subscriber-form-container">
-		<h4><?php _e( 'Add New Subscriber' , 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
+		<h4><?php _e( 'Add New Subscriber', 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
 		<form id="add-new-subcscriber">
-			<input type="text" class="regular-text" placeholder="<?php _e( 'User Email Address' , 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
+			<input type="text" class="regular-text" placeholder="<?php _e( 'User Email Address', 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
 			<p><?php echo submit_button( 'Add Subscriber' ); ?></p>
 		</form>
 	</section>
@@ -198,8 +198,8 @@ 
 									<!-- TABLE HEAD -->
 									<thead>
 										<tr>
-											<th id="user-email columnname" class="manage-column column-columnname" scope="col"><a id="user-email-sort" href="<?php echo esc_url_raw( add_query_arg( array( 'column' => 'email' , 'sort' => $opposite_sort_dir ) ) ); ?>"><?php _e( 'User Email' , 'yikes-inc-easy-mailchimp-extender' ); echo $icon;?></a></th>
-											<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Email Client' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+											<th id="user-email columnname" class="manage-column column-columnname" scope="col"><a id="user-email-sort" href="<?php echo esc_url_raw( add_query_arg( array( 'column' => 'email', 'sort' => $opposite_sort_dir ) ) ); ?>"><?php _e( 'User Email', 'yikes-inc-easy-mailchimp-extender' ); echo $icon; ?></a></th>
+											<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Email Client', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
 										</tr>
 									</thead>
 									<!-- end header -->
@@ -207,38 +207,38 @@ 
 									<!-- FOOTER -->
 									<tfoot>
 										<tr>
-											<th class="manage-column column-columnname" scope="col"><?php _e( 'User Email' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-											<th class="manage-column column-columnname num" scope="col"><?php _e( 'Email Client' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+											<th class="manage-column column-columnname" scope="col"><?php _e( 'User Email', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+											<th class="manage-column column-columnname num" scope="col"><?php _e( 'Email Client', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
 										</tr>
 									</tfoot>
 									<!-- end footer -->
 									
 									<!-- TABLE BODY -->
 									<tbody>
-										<?php if( $subscribers_list['total'] > 0 ) {
+										<?php if ( $subscribers_list[ 'total' ] > 0 ) {
 												$i = 1;
-												foreach( $subscribers_list['data'] as $subscriber ) { 
-													$user_id = $subscriber['leid'];
+												foreach ( $subscribers_list[ 'data' ] as $subscriber ) { 
+													$user_id = $subscriber[ 'leid' ];
 													// setup the email client name and icon
-													if( !empty( $subscriber['clients'] ) ) {
-														$user_email_client_name = $subscriber['clients']['name'];
-														$user_email_client_icon = "<img src='" . esc_url_raw( $subscriber['clients']['icon_url'] ) . "' alt=" . $user_email_client_name . " title=" . $user_email_client_name . ">";
+													if ( ! empty( $subscriber[ 'clients' ] ) ) {
+														$user_email_client_name = $subscriber[ 'clients' ][ 'name' ];
+														$user_email_client_icon = "<img src='" . esc_url_raw( $subscriber[ 'clients' ][ 'icon_url' ] ) . "' alt=" . $user_email_client_name . " title=" . $user_email_client_name . ">";
 													} else {
 														$path = YIKES_MC_URL . "includes/images/na.png";
-														$user_email_client_icon = "<img width='35' src='" . $path . "' alt='" . __( 'not set' , 'yikes-inc-easy-mailchimp-extender' ) . "' title='" .  __( 'not set' , 'yikes-inc-easy-mailchimp-extender' ) . "'>";
+														$user_email_client_icon = "<img width='35' src='" . $path . "' alt='" . __( 'not set', 'yikes-inc-easy-mailchimp-extender' ) . "' title='" . __( 'not set', 'yikes-inc-easy-mailchimp-extender' ) . "'>";
 													}
 													
 										?>
-											<tr class="<?php if( $i % 2 == 0 ) { echo 'alternate'; } ?>">
+											<tr class="<?php if ( $i % 2 == 0 ) { echo 'alternate'; } ?>">
 												<td class="column-columnname">	
-													<a class="user-email row-title" href="mailto:<?php echo sanitize_email( $subscriber['email'] ); ?>">
-														<?php echo sanitize_email( $subscriber['email'] ); ?>
+													<a class="user-email row-title" href="mailto:<?php echo sanitize_email( $subscriber[ 'email' ] ); ?>">
+														<?php echo sanitize_email( $subscriber[ 'email' ] ); ?>
 													</a>
 													<div class="row-actions">
-														<?php $view_user_info_url = esc_url_raw( add_query_arg( array( 'mailchimp-list' => $list_id , 'email-id' => $user_id ), admin_url() . 'admin.php?page=yikes-mailchimp-view-user' ) ); ?>
-														<span><a href="<?php echo $view_user_info_url; ?>"><?php _e( "View Info." , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
-														<?php $url = esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-unsubscribe-user', 'mailchimp-list' => $list_id , 'nonce' => wp_create_nonce( 'unsubscribe-user-'.$user_id ), 'email_id' => $user_id ) ) ); ?>
-														<span><a href="<?php echo $url; ?>" onclick="return confirm('<?php printf( __( "Are you sure you want to unsubscribe %s from this mailing list?" , 'yikes-inc-easy-mailchimp-extender' ), sanitize_email( $subscriber['email'] ) ); ?>');" class="yikes-delete-subscriber"><?php _e( "Unsubscribe" , 'yikes-inc-easy-mailchimp-extender' ); ?></a>													
+														<?php $view_user_info_url = esc_url_raw( add_query_arg( array( 'mailchimp-list' => $list_id, 'email-id' => $user_id ), admin_url() . 'admin.php?page=yikes-mailchimp-view-user' ) ); ?>
+														<span><a href="<?php echo $view_user_info_url; ?>"><?php _e( "View Info.", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
+														<?php $url = esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-unsubscribe-user', 'mailchimp-list' => $list_id, 'nonce' => wp_create_nonce( 'unsubscribe-user-' . $user_id ), 'email_id' => $user_id ) ) ); ?>
+														<span><a href="<?php echo $url; ?>" onclick="return confirm('<?php printf( __( "Are you sure you want to unsubscribe %s from this mailing list?", 'yikes-inc-easy-mailchimp-extender' ), sanitize_email( $subscriber[ 'email' ] ) ); ?>');" class="yikes-delete-subscriber"><?php _e( "Unsubscribe", 'yikes-inc-easy-mailchimp-extender' ); ?></a>													
 													</div>
 												</td>
 												<td class="column-columnname num"><?php echo $user_email_client_icon; ?></td>
@@ -248,7 +248,7 @@ 
 												}
 											} else { ?>
 											<tr class="no-items"> 
-												<td class="colspanchange no-current-subscriber-notice" colspan="2"><em><?php _e( 'No one is currently subscribed to this list.' , 'yikes-inc-easy-mailchimp-extender' ); ?></em></td>
+												<td class="colspanchange no-current-subscriber-notice" colspan="2"><em><?php _e( 'No one is currently subscribed to this list.', 'yikes-inc-easy-mailchimp-extender' ); ?></em></td>
 											</tr>
 										<?php } ?>
 									</tbody>
@@ -260,11 +260,11 @@ 
 						<!-- pagination -->
 						<div class="tablenav">
 							<div class="tablenav-pages">
-								<a class='first-page <?php if( $paged == 0 ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the first page" , 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => 0 ) ) ); ?>'>&laquo;</a>
-								<a class='prev-page <?php if( $paged == 0 ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the previous page" , 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => intval( $paged - 1 ) ) ) ); ?>'>&lsaquo;</a>
-								<span class="paging-input"><input class='current-page' title='<?php _e( "Current page" , 'yikes-inc-easy-mailchimp-extender' ); ?>' type='text' name='paged' value='<?php if( $paged == 0 ) { echo '1'; } else { echo intval( $paged + 1 ); } ?>' size='1' /> <?php _e( 'of', 'yikes-inc-easy-mailchimp-extender' ); ?> <span class='total-pages'><?php echo $total_pages; ?></span></span>
-								<a class='next-page <?php if( $paged == intval( $total_pages - 1 ) ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the next page" , 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => intval( $paged + 1 ) ) ) ); ?>'>&rsaquo;</a>
-								<a class='last-page <?php if( $paged == intval( $total_pages - 1 ) ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the last page" , 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => intval( $total_pages - 1 ) ) ) ); ?>'>&raquo;</a>
+								<a class='first-page <?php if ( $paged == 0 ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the first page", 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => 0 ) ) ); ?>'>&laquo;</a>
+								<a class='prev-page <?php if ( $paged == 0 ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the previous page", 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => intval( $paged - 1 ) ) ) ); ?>'>&lsaquo;</a>
+								<span class="paging-input"><input class='current-page' title='<?php _e( "Current page", 'yikes-inc-easy-mailchimp-extender' ); ?>' type='text' name='paged' value='<?php if ( $paged == 0 ) { echo '1'; } else { echo intval( $paged + 1 ); } ?>' size='1' /> <?php _e( 'of', 'yikes-inc-easy-mailchimp-extender' ); ?> <span class='total-pages'><?php echo $total_pages; ?></span></span>
+								<a class='next-page <?php if ( $paged == intval( $total_pages - 1 ) ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the next page", 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => intval( $paged + 1 ) ) ) ); ?>'>&rsaquo;</a>
+								<a class='last-page <?php if ( $paged == intval( $total_pages - 1 ) ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the last page", 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => intval( $total_pages - 1 ) ) ) ); ?>'>&raquo;</a>
 							</div>
 						</div>
 						
@@ -279,21 +279,21 @@ 
 						
 						<div class="postbox yikes-easy-mc-postbox">
 																		
-							<h3><?php _e( 'List Overview' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
+							<h3><?php _e( 'List Overview', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
 							
 							<?php 
 								// store list rating
-								$list_rating = $list_data['list_rating'];
-								if( $list_rating > 0 ) {
-									$list_rating_explosion = explode( '.' , $list_rating );
+								$list_rating = $list_data[ 'list_rating' ];
+								if ( $list_rating > 0 ) {
+									$list_rating_explosion = explode( '.', $list_rating );
 									$star_array = array();
 									$x = 1; 
-									while( $list_rating_explosion[0] >= $x ) {
-										$star_array[] = '<span class="dashicons dashicons-star-filled list-rating-star"></span>';
+									while ( $list_rating_explosion[ 0 ] >= $x ) {
+										$star_array[ ] = '<span class="dashicons dashicons-star-filled list-rating-star"></span>';
 										$x++;
 									}
-									if( $list_rating_explosion[1] == '5' ) {
-										$star_array[] = '<span class="dashicons dashicons-star-half list-rating-star"></span>';
+									if ( $list_rating_explosion[ 1 ] == '5' ) {
+										$star_array[ ] = '<span class="dashicons dashicons-star-half list-rating-star"></span>';
 									}
 								} else {
 									$star_array = array( 'n/a' );
@@ -301,40 +301,40 @@ 
 							?>
 							<table class="form-table">
 								<tr valign="top">
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'List Rating' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
-									<td><?php echo implode( ' ' , $star_array ); ?></td>
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'List Rating', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
+									<td><?php echo implode( ' ', $star_array ); ?></td>
 								</tr>
 								<tr valign="top">
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Average Subscribers' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
-									<td><?php echo $list_data['stats']['avg_sub_rate']; ?><small> / <?php  _e( 'month' , 'yikes-inc-easy-mailchimp-extender' ); ?></small></td>
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Average Subscribers', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
+									<td><?php echo $list_data[ 'stats' ][ 'avg_sub_rate' ]; ?><small> / <?php  _e( 'month', 'yikes-inc-easy-mailchimp-extender' ); ?></small></td>
 								</tr>
 								<tr valign="top">
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Subscriber Count' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
-									<td><?php echo intval( $list_data['stats']['member_count'] ); ?></td>
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Subscriber Count', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
+									<td><?php echo intval( $list_data[ 'stats' ][ 'member_count' ] ); ?></td>
 								</tr>
 								<tr valign="top">
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'New Since Last Campaign' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
-									<td><?php echo intval( $list_data['stats']['member_count_since_send'] ); ?></td>
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'New Since Last Campaign', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
+									<td><?php echo intval( $list_data[ 'stats' ][ 'member_count_since_send' ] ); ?></td>
 								</tr>
 								<tr valign="top">
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Created' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
-									<td><?php echo date( get_option('date_format') , strtotime( $list_data['date_created'] ) ); ?></td>
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Created', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
+									<td><?php echo date( get_option( 'date_format' ), strtotime( $list_data[ 'date_created' ] ) ); ?></td>
 								</tr>
 								<tr valign="top">
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'List Fields' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
-									<td><?php echo intval( $list_data['stats']['merge_var_count'] + 1 ); // add 1 for our email field.. ?></td>
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'List Fields', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
+									<td><?php echo intval( $list_data[ 'stats' ][ 'merge_var_count' ] + 1 ); // add 1 for our email field.. ?></td>
 								</tr>
 								<tr valign="top">
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Short Signup URL' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
-									<td><input type="text" class="widefat view-list-sidebar-input" value="<?php echo esc_url_raw( $list_data['subscribe_url_short'] ); ?>" readonly onclick="jQuery(this).select();"></td>
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Short Signup URL', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
+									<td><input type="text" class="widefat view-list-sidebar-input" value="<?php echo esc_url_raw( $list_data[ 'subscribe_url_short' ] ); ?>" readonly onclick="jQuery(this).select();"></td>
 								</tr>
 								<tr valign="top">
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Default From Email' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
-									<td><input type="text" class="widefat view-list-sidebar-input" value="<?php echo sanitize_email( $list_data['default_from_email'] ); ?>" readonly onclick="jQuery(this).select();"></td>
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Default From Email', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
+									<td><input type="text" class="widefat view-list-sidebar-input" value="<?php echo sanitize_email( $list_data[ 'default_from_email' ] ); ?>" readonly onclick="jQuery(this).select();"></td>
 								</tr>
 								<tr valign="top">
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Default From Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
-									<td><?php echo $list_data['default_from_name']; ?></td>
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Default From Name', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
+									<td><?php echo $list_data[ 'default_from_name' ]; ?></td>
 								</tr>
 							</table>
 					
@@ -344,14 +344,14 @@ 
 						<!-- Merge Field Info -->
 						<div class="postbox yikes-easy-mc-postbox">
 																		
-							<h3><?php _e( 'Form Fields' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
+							<h3><?php _e( 'Form Fields', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
 							<?php
-								if( count( $merge_variables ) >= 1 ) {
+								if ( count( $merge_variables ) >= 1 ) {
 									?><ul class="merge-variable-ul"><?php
 										echo '<li class="interest-group-count">' . sprintf( _n( '%d Field', '%d Fields', intval( count( $merge_variables ) ), 'yikes-inc-easy-mailchimp-extender' ), intval( count( $merge_variables ) ) ) . '</li>';
-										foreach( $merge_variables as $merge_variable ) {
+										foreach ( $merge_variables as $merge_variable ) {
 											// new action hook @since 6.0.3.8
-											echo '<li class="' . $merge_variable['tag'] . '"><span class="dashicons dashicons-marker"></span>' . $merge_variable['name'] . ' ' . do_action( 'yikes-mailchimp-list-field', $merge_variable ) . '</li>';
+											echo '<li class="' . $merge_variable[ 'tag' ] . '"><span class="dashicons dashicons-marker"></span>' . $merge_variable[ 'name' ] . ' ' . do_action( 'yikes-mailchimp-list-field', $merge_variable ) . '</li>';
 										}
 									?></ul><?php
 								}
@@ -368,13 +368,13 @@ 
 						<div class="postbox yikes-easy-mc-postbox">
 							
 							
-							<h3><?php _e( 'Interest Groups Overview' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
+							<h3><?php _e( 'Interest Groups Overview', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
 							<?php
-								if( isset( $interest_groupings ) && ! isset( $interest_groupings['error'] ) ) {
+								if ( isset( $interest_groupings ) && ! isset( $interest_groupings[ 'error' ] ) ) {
 									?><ul class="interest-group-ul"><?php
 										echo '<li class="interest-group-count">' . sprintf( _n( '%d Interest Group', '%d Interest Groups', intval( count( $interest_groupings ) ), 'yikes-inc-easy-mailchimp-extender' ), intval( count( $interest_groupings ) ) ) . '</li>';
-									foreach( $interest_groupings as $interest_group ) {
-										echo '<li><span class="dashicons dashicons-marker"></span>' . $interest_group['name'] . '<span class="interest-group-title"></span><small title="' . $interest_group['groups'][0]['subscribers'] . ' ' . __( "subscribers assigned to this group" , 'yikes-inc-easy-mailchimp-extender' ) . '">(' . $interest_group['groups'][0]['subscribers'] . ')</small></li>';
+									foreach ( $interest_groupings as $interest_group ) {
+										echo '<li><span class="dashicons dashicons-marker"></span>' . $interest_group[ 'name' ] . '<span class="interest-group-title"></span><small title="' . $interest_group[ 'groups' ][ 0 ][ 'subscribers' ] . ' ' . __( "subscribers assigned to this group", 'yikes-inc-easy-mailchimp-extender' ) . '">(' . $interest_group[ 'groups' ][ 0 ][ 'subscribers' ] . ')</small></li>';
 									}
 									?></ul><?php
 								} else {
@@ -397,17 +397,17 @@ 
 						<div class="postbox yikes-easy-mc-postbox">
 							
 							
-							<h3><?php _e( 'Segments Overview' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
+							<h3><?php _e( 'Segments Overview', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
 							<?php
-								if( isset( $segments['saved'] ) && count( $segments['saved'] ) >= 1 ) {
+								if ( isset( $segments[ 'saved' ] ) && count( $segments[ 'saved' ] ) >= 1 ) {
 									$i = 1;
 									?><ul class="segment-ul"><?php
-										echo '<li class="segment-group-count">' . sprintf( _n( '%d Segment', '%d Segments', intval( count( $segments['saved'] ) ), 'yikes-inc-easy-mailchimp-extender' ), intval( count( $segments['saved'] ) ) ) . '</li>';
-									foreach( $segments['saved'] as $segment ) {
-										echo '<li><span class="dashicons dashicons-arrow-right"></span>' . $segment['name'] . ' <small><a href="#" onclick="jQuery(this).parent().parent().next().slideToggle();jQuery(this).toggleText();return false;" data-alt-text="' . __( 'hide conditions' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( "view conditions" , 'yikes-inc-easy-mailchimp-extender' ) . '</a></small></li>';
+										echo '<li class="segment-group-count">' . sprintf( _n( '%d Segment', '%d Segments', intval( count( $segments[ 'saved' ] ) ), 'yikes-inc-easy-mailchimp-extender' ), intval( count( $segments[ 'saved' ] ) ) ) . '</li>';
+									foreach ( $segments[ 'saved' ] as $segment ) {
+										echo '<li><span class="dashicons dashicons-arrow-right"></span>' . $segment[ 'name' ] . ' <small><a href="#" onclick="jQuery(this).parent().parent().next().slideToggle();jQuery(this).toggleText();return false;" data-alt-text="' . __( 'hide conditions', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( "view conditions", 'yikes-inc-easy-mailchimp-extender' ) . '</a></small></li>';
 										?><div class="conditionals yikes-easy-mc-hidden"><?php
-										foreach( $segment['segment_opts']['conditions'] as $condition ) {
-											echo '<li><small>' . sprintf( __( 'condition #%s : If %s %s %s', 'yikes-inc-easy-mailchimp-extender' ), intval( $i ), $condition['field'],  $condition['op'], $condition['value'] ) . '</small></li>';
+										foreach ( $segment[ 'segment_opts' ][ 'conditions' ] as $condition ) {
+											echo '<li><small>' . sprintf( __( 'condition #%s : If %s %s %s', 'yikes-inc-easy-mailchimp-extender' ), intval( $i ), $condition[ 'field' ], $condition[ 'op' ], $condition[ 'value' ] ) . '</small></li>';
 											$i++;
 										}
 										?></div><?php
@@ -422,9 +422,9 @@ 
 								}
 							?>
 							<!--
-								<a class="edit-segments-button" href="#" onclick="return false;" class="button-primary"><?php _e( 'Edit Segments' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+								<a class="edit-segments-button" href="#" onclick="return false;" class="button-primary"><?php _e( 'Edit Segments', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 							-->
-							<p class="description edit-segment-description"><?php _e( 'To edit this lists segments, head over to' , 'yikes-inc-easy-mailchimp-extender' ); ?> <a href="http://www.MailChimp.com" target="_blank">MailChimp</a></p>
+							<p class="description edit-segment-description"><?php _e( 'To edit this lists segments, head over to', 'yikes-inc-easy-mailchimp-extender' ); ?> <a href="http://www.MailChimp.com" target="_blank">MailChimp</a></p>
 							
 						</div>
 						

admin/partials/upgrade-helpers/upgrade-migrate-options.php

Spacing +53 added lines, -53 removed lines

@@ -9,30 +9,30 @@ 
 	*/
 		
 	// enqueue the styles for our migration page..
-	wp_enqueue_style( 'yikes_mc_migrate_option_styles' , YIKES_MC_URL . 'admin/css/yikes-inc-easy-mailchimp-migrate-option-styles.css' );
-	wp_enqueue_style( 'animate-css' , YIKES_MC_URL . 'admin/css/animate.min.css' );
+	wp_enqueue_style( 'yikes_mc_migrate_option_styles', YIKES_MC_URL . 'admin/css/yikes-inc-easy-mailchimp-migrate-option-styles.css' );
+	wp_enqueue_style( 'animate-css', YIKES_MC_URL . 'admin/css/animate.min.css' );
 	
 	// store our old options
 	$old_plugin_options = get_option( 'ykseme_storage' );
 	
 	$global_error_messages = array(
-		'success' => __( $old_plugin_options['single-optin-message'] , 'yikes-inc-easy-mailchimp-extender' ),
-		'general-error' => __( "Whoops! It looks like something went wrong. Please try again." , 'yikes-inc-easy-mailchimp-extender' ),
-		'invalid-email' => __( "Please provide a valid email address." , 'yikes-inc-easy-mailchimp-extender' ),
-		'email-exists-error' => __( "The provided email is already subscribed to this list." , 'yikes-inc-easy-mailchimp-extender' )
+		'success' => __( $old_plugin_options[ 'single-optin-message' ], 'yikes-inc-easy-mailchimp-extender' ),
+		'general-error' => __( "Whoops! It looks like something went wrong. Please try again.", 'yikes-inc-easy-mailchimp-extender' ),
+		'invalid-email' => __( "Please provide a valid email address.", 'yikes-inc-easy-mailchimp-extender' ),
+		'email-exists-error' => __( "The provided email is already subscribed to this list.", 'yikes-inc-easy-mailchimp-extender' )
 	);
 	
 	// if old options are defined...
-	if( $old_plugin_options ) {
+	if ( $old_plugin_options ) {
 		
 		// Verify the NONCE is valid
-		check_admin_referer( 'yikes-mc-migrate-options' , 'migrate_options_nonce' );
+		check_admin_referer( 'yikes-mc-migrate-options', 'migrate_options_nonce' );
 		
 		?>
 			
 		<div class="wrap" style="text-align:center;">
-			<h3><?php _e( 'Migrating old plugin options' , 'yikes-inc-easy-mailchimp-extender' ); ?><span class="upgrading-ellipse-one">.</span><span class="upgrading-ellipse-two">.</span><span class="upgrading-ellipse-three">.</h3>
-			<p><?php _e( 'please be patient while your options are updated and the process has completed' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+			<h3><?php _e( 'Migrating old plugin options', 'yikes-inc-easy-mailchimp-extender' ); ?><span class="upgrading-ellipse-one">.</span><span class="upgrading-ellipse-two">.</span><span class="upgrading-ellipse-three">.</h3>
+			<p><?php _e( 'please be patient while your options are updated and the process has completed', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 			<!-- empty list, populate when options  get updated -->
 			<ul id="options-updated" class="yikes-easy-mc-hidden">
 				<hr />
@@ -46,82 +46,82 @@ 
 				
 					// loop over our old options, and store them in a new option value
 					$do_not_migrate_options = array(
-						'ssl_verify_peer', 'api_validation' , 'widget_yikes_mc_widget' , 'flavor' , 'single-optin-message' , 'double-optin-message' ,
-						'mailchimp-optIn-default-list' , 'version' , 'yks-mailchimp-jquery-datepicker' , 'ssl_verify_peer' , 'optIn-checkbox' , 'yks-mailchimp-optin-checkbox-text',
-						'yks-mailchimp-required-text' , 'optin'
+						'ssl_verify_peer', 'api_validation', 'widget_yikes_mc_widget', 'flavor', 'single-optin-message', 'double-optin-message',
+						'mailchimp-optIn-default-list', 'version', 'yks-mailchimp-jquery-datepicker', 'ssl_verify_peer', 'optIn-checkbox', 'yks-mailchimp-optin-checkbox-text',
+						'yks-mailchimp-required-text', 'optin'
 					);
 							
-					foreach( $old_plugin_options as $option_name => $option_value ) {
+					foreach ( $old_plugin_options as $option_name => $option_value ) {
 												
-						if( ! in_array( $option_name , $do_not_migrate_options ) ) {
+						if ( ! in_array( $option_name, $do_not_migrate_options ) ) {
 							// ajax request to update our options one by one..
 							// if its an array, we need to json encode it
-							if( is_array( $option_value ) ) {
+							if ( is_array( $option_value ) ) {
 								
-								if( $option_name == 'lists' ) {
+								if ( $option_name == 'lists' ) {
 																	
-									if( ! empty( $option_value ) ) {
+									if ( ! empty( $option_value ) ) {
 										$settings = 1;
 										$form_length = count( $option_value );
-										foreach( $option_value as $mailchimp_form ) {
+										foreach ( $option_value as $mailchimp_form ) {
 											// update and pass our placeholder value
 											reset( $mailchimp_form );
-											$form_id = $mailchimp_form['id'];
+											$form_id = $mailchimp_form[ 'id' ];
 											
-											$fields = $mailchimp_form['fields'];	
+											$fields = $mailchimp_form[ 'fields' ];	
 											reset( $fields );
 											$first_field_key = key( $fields );
 											$array_keys = array_keys( $fields );
 											
 											$x = 1;								
 					
-											foreach( $array_keys as $parent_key ) {
+											foreach ( $array_keys as $parent_key ) {
 												
 												// alter the field keys so they show up after an import
 												$split_parent_key = explode( '-', $parent_key );
 
-												$new_parent_key = ( isset( $split_parent_key[1] ) ) ? strtoupper( $split_parent_key[1] ) : $parent_key;
+												$new_parent_key = ( isset( $split_parent_key[ 1 ] ) ) ? strtoupper( $split_parent_key[ 1 ] ) : $parent_key;
 
-												$mailchimp_form['fields'][$new_parent_key] = $mailchimp_form['fields'][$parent_key];
+												$mailchimp_form[ 'fields' ][ $new_parent_key ] = $mailchimp_form[ 'fields' ][ $parent_key ];
 
-												unset( $mailchimp_form['fields'][$parent_key] );			
+												unset( $mailchimp_form[ 'fields' ][ $parent_key ] );			
 										
 												// update our placeholder key to be 'placeholder'
-												$mailchimp_form['fields'][$new_parent_key]['placeholder'] = isset( $mailchimp_form['fields'][$new_parent_key]['placeholder-'.$form_id.'-'.$x] ) ? $mailchimp_form['fields'][$new_parent_key]['placeholder-'.$form_id.'-'.$x] : '';
+												$mailchimp_form[ 'fields' ][ $new_parent_key ][ 'placeholder' ] = isset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'placeholder-' . $form_id . '-' . $x ] ) ? $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'placeholder-' . $form_id . '-' . $x ] : '';
 												// update field classes
-												$mailchimp_form['fields'][$new_parent_key]['additional-classes'] = isset( $mailchimp_form['fields'][$new_parent_key]['custom-field-class-'.$form_id.'-'.$x] ) ? $mailchimp_form['fields'][$new_parent_key]['custom-field-class-'.$form_id.'-'.$x] : '';
+												$mailchimp_form[ 'fields' ][ $new_parent_key ][ 'additional-classes' ] = isset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'custom-field-class-' . $form_id . '-' . $x ] ) ? $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'custom-field-class-' . $form_id . '-' . $x ] : '';
 												// update help field - populate description
-												$mailchimp_form['fields'][$new_parent_key]['description'] = isset( $mailchimp_form['fields'][$new_parent_key]['help'] ) ? $mailchimp_form['fields'][$new_parent_key]['help'] : ''; 
+												$mailchimp_form[ 'fields' ][ $new_parent_key ][ 'description' ] = isset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'help' ] ) ? $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'help' ] : ''; 
 												// remove the old placeholder structure
-												unset( $mailchimp_form['fields'][$new_parent_key]['placeholder-'.$form_id.'-'.$x] );
+												unset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'placeholder-' . $form_id . '-' . $x ] );
 												// remove old custom class structure
-												unset( $mailchimp_form['fields'][$new_parent_key]['custom-field-class-'.$form_id.'-'.$x] );
+												unset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'custom-field-class-' . $form_id . '-' . $x ] );
 												// remove old help/description 
-												unset( $mailchimp_form['fields'][$new_parent_key]['help'] );
+												unset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'help' ] );
 																							
 												// check if choices is set, and encode them
-												if( isset( $mailchimp_form['fields'][$new_parent_key]['choices'] ) && ! empty( $mailchimp_form['fields'][$new_parent_key]['choices'] ) ) {
-													$mailchimp_form['fields'][$new_parent_key]['choices'] = addslashes( addslashes( json_encode( $mailchimp_form['fields'][$new_parent_key]['choices'] ) ) );
+												if ( isset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'choices' ] ) && ! empty( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'choices' ] ) ) {
+													$mailchimp_form[ 'fields' ][ $new_parent_key ][ 'choices' ] = addslashes( addslashes( json_encode( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'choices' ] ) ) );
 												}	
 
 												// update 'default' to 'default-choice' for radio/dropdown
-												if( isset( $mailchimp_form['fields'][$new_parent_key]['type'] ) && in_array( $mailchimp_form['fields'][$new_parent_key]['type'], array( 'radio', 'dropdown' ) ) ) {
-													$mailchimp_form['fields'][$new_parent_key]['default_choice'] = $mailchimp_form['fields'][$new_parent_key]['default'];
-													unset( $mailchimp_form['fields'][$new_parent_key]['default'] );
+												if ( isset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'type' ] ) && in_array( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'type' ], array( 'radio', 'dropdown' ) ) ) {
+													$mailchimp_form[ 'fields' ][ $new_parent_key ][ 'default_choice' ] = $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'default' ];
+													unset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'default' ] );
 												}
 												
 												// update 'date_format' on 'birthday' and 'date' fields
-												if( isset( $mailchimp_form['fields'][$new_parent_key]['type'] ) && in_array( $mailchimp_form['fields'][$new_parent_key]['type'], array( 'date', 'birthday' ) ) ) {
-													if( $mailchimp_form['fields'][$new_parent_key]['type'] == 'date' ) { // date
-														$mailchimp_form['fields'][$new_parent_key]['date_format'] = 'MM/DD'; // mailchimp default (can be altered)
+												if ( isset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'type' ] ) && in_array( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'type' ], array( 'date', 'birthday' ) ) ) {
+													if ( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'type' ] == 'date' ) { // date
+														$mailchimp_form[ 'fields' ][ $new_parent_key ][ 'date_format' ] = 'MM/DD'; // mailchimp default (can be altered)
 													} else { // birthday 
-														$mailchimp_form['fields'][$new_parent_key]['date_format'] = 'MM/DD/YYYY'; // mailchimp default (can be altered)
+														$mailchimp_form[ 'fields' ][ $new_parent_key ][ 'date_format' ] = 'MM/DD/YYYY'; // mailchimp default (can be altered)
 													}
 												}
 												
 												// update 'phone_format' on 'phone'
-												if( isset( $mailchimp_form['fields'][$new_parent_key]['type'] ) && in_array( $mailchimp_form['fields'][$new_parent_key]['type'], array( 'phone' ) ) ) {
-													$mailchimp_form['fields'][$new_parent_key]['phone_format'] = 'phone_format '; // phone format
+												if ( isset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'type' ] ) && in_array( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'type' ], array( 'phone' ) ) ) {
+													$mailchimp_form[ 'fields' ][ $new_parent_key ][ 'phone_format' ] = 'phone_format '; // phone format
 												}
 												
 												$x++;
@@ -138,7 +138,7 @@ 
 																								
 												$.post( ajaxurl, mc_data, function(response) {
 													jQuery( '#options-updated' ).show();
-													jQuery( '#options-updated' ).append( '<li class="animated fadeInDown"><?php echo '<strong>'; ?>' + response.form_name + '<?php echo '</strong> ' . __( "successfully imported." , 'yikes-inc-easy-mailchimp-extender' ); ?></li>' );	
+													jQuery( '#options-updated' ).append( '<li class="animated fadeInDown"><?php echo '<strong>'; ?>' + response.form_name + '<?php echo '</strong> ' . __( "successfully imported.", 'yikes-inc-easy-mailchimp-extender' ); ?></li>' );	
 													if( response.completed_import ) {
 														setTimeout( function() {
 															// finished with the loop...lets let the user know....and then redirect them....
@@ -147,13 +147,13 @@ 
 															jQuery( '.upgrading-ellipse-two' ).remove();
 															jQuery( '.upgrading-ellipse-three' ).remove();
 															jQuery( '.wrap' ).find( 'h3' ).next().fadeOut();
-															jQuery( '#options-updated' ).append( '<li class="animated fadeInDown migration-complete-notification"><em><?php _e( "Migration Complete. Please wait..." , 'yikes-inc-easy-mailchimp-extender' ); ?> </em> <img src="<?php echo esc_url_raw( admin_url( "images/wpspin_light.gif" ) ); ?>" /></li>' );
+															jQuery( '#options-updated' ).append( '<li class="animated fadeInDown migration-complete-notification"><em><?php _e( "Migration Complete. Please wait...", 'yikes-inc-easy-mailchimp-extender' ); ?> </em> <img src="<?php echo esc_url_raw( admin_url( "images/wpspin_light.gif" ) ); ?>" /></li>' );
 															// redirect our user to the main plugin page...
 															setTimeout( function() {
 																<?php 
 																	// migrate options that didnt make it (they were never stored in the 'ykseme_storage' options array)
-																	add_option( 'yikes-mc-api-validation' , get_option( 'api_validation' , 'invalid_api_key' ) );
-																	add_option( 'yikes-mc-error-messages' , $global_error_messages );
+																	add_option( 'yikes-mc-api-validation', get_option( 'api_validation', 'invalid_api_key' ) );
+																	add_option( 'yikes-mc-error-messages', $global_error_messages );
 																	// delete our old options after a successful migration (and some new ones that are no longer needed)
 																	delete_option( 'widget_yikes_mc_widget' );
 																	delete_option( 'api_validation' );
@@ -174,26 +174,26 @@ 
 							}
 							/* Rename our ReCaptcha Options */
 								/* Public Site Key */
-								if( $option_name == 'recaptcha-api-key' ) {
+								if ( $option_name == 'recaptcha-api-key' ) {
 									$option_name = 'recaptcha-site-key';
 								}
 								/* Private Key */
-								if( $option_name == 'recaptcha-private-api-key'  ) {
+								if ( $option_name == 'recaptcha-private-api-key' ) {
 									$option_name = 'recaptcha-secret-key';
 								}
 								/* Change 'recaptcha-setting' to 'recaptcha-status' */
 								/* Status */
-								if( $option_name == 'recaptcha-setting' ) {
+								if ( $option_name == 'recaptcha-setting' ) {
 									$option_name = 'recaptcha-status';
 								}
 							/* End  re-name ReCaptcha options */
 							
 
-							if( is_array( $option_value ) ) {
+							if ( is_array( $option_value ) ) {
 								$option_value = json_encode( $option_value );
 							}
 							// do noit migrate the lists option, it's not useful to us
-							if( $option_name != 'lists' ) {
+							if ( $option_name != 'lists' ) {
 								?>
 									var data = {
 										'action': 'migrate_old_plugin_settings',
@@ -203,7 +203,7 @@ 
 													
 									$.post( ajaxurl, data, function(response) {
 										jQuery( '#options-updated' ).show();
-										jQuery( '#options-updated' ).append( '<li class="animated fadeInDown"><?php echo '<strong>' . ucwords( str_replace( '_' , ' ' , str_replace( '-' , ' ' , $option_name ) ) ) . '</strong> ' . __( "successfully imported." , 'yikes-inc-easy-mailchimp-extender' ); ?></li>' );	
+										jQuery( '#options-updated' ).append( '<li class="animated fadeInDown"><?php echo '<strong>' . ucwords( str_replace( '_', ' ', str_replace( '-', ' ', $option_name ) ) ) . '</strong> ' . __( "successfully imported.", 'yikes-inc-easy-mailchimp-extender' ); ?></li>' );	
 									});
 								<?php
 								
@@ -227,7 +227,7 @@ 
 					}, 2000 );
 			</script>
 		<?php
-			wp_die( '<strong>' . __( 'Old plugin options do not exist. Redirecting you...' , 'yikes-inc-easy-mailchimp-extender' ) . '</strong>' , 500 );
+			wp_die( '<strong>' . __( 'Old plugin options do not exist. Redirecting you...', 'yikes-inc-easy-mailchimp-extender' ) . '</strong>', 500 );
 		?>
 		</div>
 		<?php

public/partials/shortcodes/yikes-mailchimp-subscriber-count.php

Spacing +21 added lines, -21 removed lines

@@ -12,42 +12,42 @@ 
 		array(
 			'form' => '', // pass in a form, which will retreive the associated list ID -- takes precendence
 			'list' => '', // pass in a specific list ID
-		), $attributes , 'yikes-mailchimp-subscriber-count' )
+		), $attributes, 'yikes-mailchimp-subscriber-count' )
 	);
 	
 	/* If the user hasn't authenticated yet - bail */
-	if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) != 'valid_api_key' ) {
-		if( WP_DEBUG ) {
+	if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'valid_api_key' ) {
+		if ( WP_DEBUG ) {
 			return '<strong>' . __( "You don't appear to be connected to MailChimp.", "yikes-inc-easy-mailchimp-extender" ) . '</strong>';
 		} 
 		return;
 	}
 	
-	$form = ( ! empty( $attributes['form'] ) ) ? str_replace( '&quot;', '', $attributes['form'] ) : false; // replace the sanitize quotes to perform a proper query
-	$list_id = ( ! empty( $attributes['list'] ) ) ? $attributes['list'] : false;
+	$form = ( ! empty( $attributes[ 'form' ] ) ) ? str_replace( '&quot;', '', $attributes[ 'form' ] ) : false; // replace the sanitize quotes to perform a proper query
+	$list_id = ( ! empty( $attributes[ 'list' ] ) ) ? $attributes[ 'list' ] : false;
 		
 	/* If no list ID was passed into the shortcode - bail */
-	if( ! $list_id  && ! $form) {
-		if( WP_DEBUG ) {
+	if ( ! $list_id && ! $form ) {
+		if ( WP_DEBUG ) {
 			return '<strong>' . __( 'You forgot to include the list or form ID.', 'yikes-inc-easy-mailchimp-extender' ) . '</strong>';
 		} 
 		return;	
 	}
 
 	/* if a form ID and a list ID were passed in, use the form ID */
-	if( ( $form ) || ( $form && $list_id ) ) {
+	if ( ( $form ) || ( $form && $list_id ) ) {
 		global $wpdb;
 		// return it as an array, so we can work with it to build our form below
 		$form_results = $wpdb->get_results( 'SELECT * FROM ' . $wpdb->prefix . 'yikes_easy_mc_forms WHERE id = ' . $form . '', ARRAY_A );
 		// confirm we have some results, or return an error
-		if( ! $form_results ) {
-			if( WP_DEBUG ) {	
-				return __( "Oh no...This form doesn't exist. Head back to the manage forms page and select a different form." , 'yikes-inc-easy-mailchimp-extender' );
+		if ( ! $form_results ) {
+			if ( WP_DEBUG ) {	
+				return __( "Oh no...This form doesn't exist. Head back to the manage forms page and select a different form.", 'yikes-inc-easy-mailchimp-extender' );
 			}
 			return;
 		}
-		$form_data = $form_results[0];
-		$list_id = sanitize_key( $form_data['list_id'] ); // associated list id (users who fill out the form will be subscribed to this list)
+		$form_data = $form_results[ 0 ];
+		$list_id = sanitize_key( $form_data[ 'list_id' ] ); // associated list id (users who fill out the form will be subscribed to this list)
 	}
 	
 	// object buffer 
@@ -57,9 +57,9 @@ 
 	try {
 	
 		// get 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, '-' );
-		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';
 		}
 		
@@ -76,23 +76,23 @@ 
 		) );
 		
 		$subscriber_count_response = json_decode( wp_remote_retrieve_body( $subscriber_count_response ), true );
-		if( isset( $subscriber_count_response['error'] ) ) {		
-			if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+		if ( isset( $subscriber_count_response[ '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( $subscriber_count_response['error'], __( "Get Account Lists" , 'yikes-inc-easy-mailchimp-extender' ), "yikes-mailchimp-subscriber-count.php" );
+				$error_logging->yikes_easy_mailchimp_write_to_error_log( $subscriber_count_response[ 'error' ], __( "Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ), "yikes-mailchimp-subscriber-count.php" );
 			}
 		}
 		// if more than one list is returned, something went wrong - bail
-		if( $subscriber_count_response['total'] != 1 ) {
-			if( WP_DEBUG ) {
+		if ( $subscriber_count_response[ 'total' ] != 1 ) {
+			if ( WP_DEBUG ) {
 				return '<strong>' . sprintf( __( "It looks like this list wasn't found. Double check the list with with ID '%s' exists.", "yikes-inc-easy-mailchimp-extender" ), $list_id ) . '</strong>';
 			} 
 			return;
 		}
 				
 		/* type cast the returned value as an integer */
-		echo (int) apply_filters( 'yikes-mailchimp-subscriber-count-value', $subscriber_count_response['data'][0]['stats']['member_count'] );
+		echo (int) apply_filters( 'yikes-mailchimp-subscriber-count-value', $subscriber_count_response[ 'data' ][ 0 ][ 'stats' ][ 'member_count' ] );
 		
 	} catch ( Exception $error ) {
 		echo $error->getMessage();

public/partials/shortcodes/process_form_shortcode_depracated.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 		), $atts )
 	);
 	
-	return '<p><em>' . __( 'This MailChimp shortcode is now deprecated. Please insert the new shortcode to display this form.' , 'yikes-inc-easy-mailchimp-extender' ) . '</em></p>';
+	return '<p><em>' . __( 'This MailChimp shortcode is now deprecated. Please insert the new shortcode to display this form.', 'yikes-inc-easy-mailchimp-extender' ) . '</em></p>';
 	
 }
 add_shortcode( 'yks-mailchimp-list', 'process_depracated_mailchimp_shortcode' ); ?>
\ No newline at end of file