yikesinc / yikes-inc-easy-mailchimp-extender

admin/partials/menu/manage-forms.php

Spacing +50 added lines, -50 removed lines

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

admin/partials/menu/support.php

Spacing +9 added lines, -9 removed lines

@@ -9,21 +9,21 @@
 <div class="wrap yikes-easy-mc-support-wrap yikes-easy-mc-wrap">
 
 	<!-- Freddie Logo -->
-	<img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - Mailchimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
+	<img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - Mailchimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
 
-	<h1>Easy Forms for Mailchimp | <?php _e( 'Support' , 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
+	<h1>Easy Forms for Mailchimp | <?php _e( 'Support', 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
 		<!-- Support Page Description -->
-	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'If you have questions, we have answers!' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'If you have questions, we have answers!', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
-	<?php if( get_option( 'yikes-easy-mc-active-addons' , array() ) == array() ) { ?>
-		<p><?php _e( 'Users of the free version of Easy Forms for Mailchimp can post questions to our support forum on the WordPress Plugin Directory. We aim to respond to support requests for the free version of the plugin within a week.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
-		<p><?php printf( __( 'Purchasers of our paid add-ons qualify for premium support. <a href="%s" target="_blank" title="' . __( 'Check out our paid add-ons', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Check out our paid add-ons', 'yikes-inc-easy-mailchimp-extender' ) . '</a>!' , 'yikes-inc-easy-mailchimp-extender' ), esc_url( 'https://yikesplugins.com/' ) ); ?></p>
+	<?php if ( get_option( 'yikes-easy-mc-active-addons', array() ) == array() ) { ?>
+		<p><?php _e( 'Users of the free version of Easy Forms for Mailchimp can post questions to our support forum on the WordPress Plugin Directory. We aim to respond to support requests for the free version of the plugin within a week.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<p><?php printf( __( 'Purchasers of our paid add-ons qualify for premium support. <a href="%s" target="_blank" title="' . __( 'Check out our paid add-ons', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Check out our paid add-ons', 'yikes-inc-easy-mailchimp-extender' ) . '</a>!', 'yikes-inc-easy-mailchimp-extender' ), esc_url( 'https://yikesplugins.com/' ) ); ?></p>
 	<?php } else { ?>
-		<p><?php _e( "It looks like you are one of our premium users! Fill out the form below to submit a priority support request." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
-		<p><?php _e( "If you have any problems with the form, send an email to <a href='mailto:support@yikesinc.com'>support@yikesinc.com</a> and a ticket will be created." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<p><?php _e( "It looks like you are one of our premium users! Fill out the form below to submit a priority support request.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<p><?php _e( "If you have any problems with the form, send an email to <a href='mailto:support@yikesinc.com'>support@yikesinc.com</a> and a ticket will be created.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 	<?php } ?>
 
-		<p><?php printf( __( 'Before submitting a support request, please visit our %s.' , 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/' ) . '" title="' . __( 'Knowledge Base', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'knowledge base', 'yikes-inc-easy-mailchimp-extender' ) . '</a> where we have step-by-step guides and troubleshooting help' ); ?></p>
+		<p><?php printf( __( 'Before submitting a support request, please visit our %s.', 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/' ) . '" title="' . __( 'Knowledge Base', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'knowledge base', 'yikes-inc-easy-mailchimp-extender' ) . '</a> where we have step-by-step guides and troubleshooting help' ); ?></p>
 
 	<hr />
 	

admin/partials/menu/add-ons.php

Spacing +3 added lines, -3 removed lines

@@ -7,12 +7,12 @@
 <div class="wrap yikes-easy-mc-wrap">
 
 	<!-- Freddie Logo -->
-	<img src="<?php echo esc_url( YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png' ); ?>" alt="<?php esc_attr_e( 'Freddie - Mailchimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
+	<img src="<?php echo esc_url( YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png' ); ?>" alt="<?php esc_attr_e( 'Freddie - Mailchimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
 
-	<h1>Easy Forms for Mailchimp | <?php echo esc_attr__( 'Add-Ons' , 'yikes-inc-easy-mailchimp-extender' ); ?> &nbsp; <a href="https://yikesplugins.com/plugins/?plugins=Mailchimp" target="_blank" class="button-primary coming-soon-button" title="<?php esc_attr_e( 'View All Add-Ons' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php esc_attr_e( 'View All Add-Ons' , 'yikes-inc-easy-mailchimp-extender' ); ?> <span class="dashicons dashicons-external"></span></a></h1>
+	<h1>Easy Forms for Mailchimp | <?php echo esc_attr__( 'Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?> &nbsp; <a href="https://yikesplugins.com/plugins/?plugins=Mailchimp" target="_blank" class="button-primary coming-soon-button" title="<?php esc_attr_e( 'View All Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php esc_attr_e( 'View All Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?> <span class="dashicons dashicons-external"></span></a></h1>
 
 	<!-- Addons Page Description -->
-	<p class="yikes-easy-mc-about-text about-text"><?php esc_attr_e( "Below you'll find all free and paid add-ons available for Easy Forms for Mailchimp. Each add-on extends the functionality of the free plugin." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+	<p class="yikes-easy-mc-about-text about-text"><?php esc_attr_e( "Below you'll find all free and paid add-ons available for Easy Forms for Mailchimp. Each add-on extends the functionality of the free plugin.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
 	<!-- Add-On Container -->
 	<section id="add-ons">

admin/partials/menu/manage-lists.php

Spacing +28 added lines, -28 removed lines

@@ -36,16 +36,16 @@ 
 ?>
 <div class="wrap yikes-easy-mc-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>Easy Forms for Mailchimp | <?php _e( 'Manage Mailing Lists' , 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
+	<h1>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.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Make edits to your Mailchimp lists.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
 	<?php
 		/* If the user hasn't authenticated yet, lets kill off */
-		if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) != 'valid_api_key' ) {
+		if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'valid_api_key' ) {
 
 			$error_string = sprintf(
 				esc_html__( 'You need to connect to Mailchimp before you can start creating forms. Head over to the %s and enter your API key.', 'yikes-inc-easy-mailchimp-extender' ),
@@ -81,8 +81,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 -->
@@ -90,25 +90,25 @@ 
 									<!-- FOOTER -->
 									<tfoot>
 										<tr>
-											<th class="manage-column column-columnname" scope="col"><?php _e( 'List Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-											<th class="manage-column column-columnname num" scope="col"><?php _e( 'Subscriber Count' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+											<th class="manage-column column-columnname" scope="col"><?php _e( 'List Name', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+											<th class="manage-column column-columnname num" scope="col"><?php _e( 'Subscriber Count', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
 										</tr>
 									</tfoot>
 									<!-- end footer -->
 
 									<!-- TABLE BODY -->
 									<tbody>
-										<?php if( count( $list_data ) > 0 ) {
+										<?php if ( count( $list_data ) > 0 ) {
 											$i = 1;
-											foreach( $list_data as $list ) {
+											foreach ( $list_data as $list ) {
 												?>
-												<tr class="<?php if( $i % 2 == 0 ) { echo 'alternate'; } ?>">
+												<tr class="<?php if ( $i % 2 == 0 ) { echo 'alternate'; } ?>">
 													<td class="column-columnname">
-														<a href="<?php echo esc_url_raw( add_query_arg( array( 'list-id' => $list['id'] ) , admin_url( 'admin.php?page=yikes-mailchimp-view-list' ) ) ); ?>" class="row-title">
-															<?php echo stripslashes( $list['name'] ); ?>
+														<a href="<?php echo esc_url_raw( add_query_arg( array( 'list-id' => $list[ 'id' ] ), admin_url( 'admin.php?page=yikes-mailchimp-view-list' ) ) ); ?>" class="row-title">
+															<?php echo stripslashes( $list[ 'name' ] ); ?>
 														</a>
 														<div class="row-actions">
-															<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'list-id' => $list['id'] ) , admin_url( 'admin.php?page=yikes-mailchimp-view-list' ) ) ); ?>"><?php _e( "View" , 'yikes-inc-easy-mailchimp-extender' ); ?></a></span>
+															<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'list-id' => $list[ 'id' ] ), admin_url( 'admin.php?page=yikes-mailchimp-view-list' ) ) ); ?>"><?php _e( "View", 'yikes-inc-easy-mailchimp-extender' ); ?></a></span>
 															<?php
 																/*
 																*	Custom action to allow users to add additional action links
@@ -118,7 +118,7 @@ 
 															?>
 														</div>
 													</td>
-													<td class="column-columnname num"><?php echo $list['stats']['member_count']; ?></td>
+													<td class="column-columnname num"><?php echo $list[ 'stats' ][ 'member_count' ]; ?></td>
 												</tr>
 												<?php
 												$i++;
@@ -126,7 +126,7 @@ 
 											} else {
 											?>
 											<tr class="no-items">
-												<td class="colspanchange no-mailchimp-lists-found" colspan="3"><em><?php printf( __( 'No Mailchimp lists found. Head over to <a href="%s" title="Mailchimp.com">Mailchimp.com</a> to setup your first mailing list. Once thats done you can head back here to customize it!' , 'yikes-inc-easy-mailchimp-extender' ), esc_url( 'http://mailchimp.com/' ) ); ?></em></td>
+												<td class="colspanchange no-mailchimp-lists-found" colspan="3"><em><?php printf( __( 'No Mailchimp lists found. Head over to <a href="%s" title="Mailchimp.com">Mailchimp.com</a> to setup your first mailing list. Once thats done you can head back here to customize it!', 'yikes-inc-easy-mailchimp-extender' ), esc_url( 'http://mailchimp.com/' ) ); ?></em></td>
 											</tr>
 										<?php } ?>
 									</tbody>
@@ -146,8 +146,8 @@ 
 					<div class="postbox yikes-easy-mc-postbox">
 						<div class="inside">
 
-							<a href="https://us3.admin.mailchimp.com/" title="<?php _e( 'Mailchimp Site' , 'yikes-inc-easy-mailchimp-extender' ); ?>" target="_blank">
-								<img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/mailchimp-logo.png'; ?>" title="<?php _e( 'Mailchimp Site' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="list-page-mailchimp-logo">
+							<a href="https://us3.admin.mailchimp.com/" title="<?php _e( 'Mailchimp Site', 'yikes-inc-easy-mailchimp-extender' ); ?>" target="_blank">
+								<img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/mailchimp-logo.png'; ?>" title="<?php _e( 'Mailchimp Site', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="list-page-mailchimp-logo">
 							</a>
 
 						</div>
@@ -157,42 +157,42 @@ 
 					<div class="postbox yikes-easy-mc-postbox list-page-sidebar">
 						<div class="inside">
 
-							<h2 class="account-status"><?php echo $account_details['username']; ?> <small>(<?php echo $account_details['role']; ?>)</small></h2>
+							<h2 class="account-status"><?php echo $account_details[ 'username' ]; ?> <small>(<?php echo $account_details[ 'role' ]; ?>)</small></h2>
 
-							<img class="mailchimp-avatar" src="<?php echo esc_url_raw( $account_details['avatar_url'] ); ?>" title="<?php echo $account_details['username'] . ' ' . __( "Mailchimp avatar" , 'yikes-inc-easy-mailchimp-extender' ); ?>">
+							<img class="mailchimp-avatar" src="<?php echo esc_url_raw( $account_details[ 'avatar_url' ] ); ?>" title="<?php echo $account_details[ 'username' ] . ' ' . __( "Mailchimp avatar", 'yikes-inc-easy-mailchimp-extender' ); ?>">
 
 							<table class="form-table" id="account-details-table">
 								<tr valign="top">
 									<td scope="row">
 										<label for="tablecell">
-											<strong><?php _e( 'Company' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+											<strong><?php _e( 'Company', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 										</label>
 									</td>
-									<td><?php echo $account_details['contact']['company']; ?><br /><?php echo $account_details['contact']['city'] . ', ' . $account_details['contact']['state']; ?></td>
+									<td><?php echo $account_details[ 'contact' ][ 'company' ]; ?><br /><?php echo $account_details[ 'contact' ][ 'city' ] . ', ' . $account_details[ 'contact' ][ 'state' ]; ?></td>
 								</tr>
 								<tr valign="top">
 									<td scope="row">
 										<label for="tablecell">
-											<strong><?php _e( 'Industry' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+											<strong><?php _e( 'Industry', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 										</label>
 									</td>
-									<td><?php echo $account_details['account_industry']; ?></td>
+									<td><?php echo $account_details[ 'account_industry' ]; ?></td>
 								</tr>
 								<tr valign="top">
 									<td scope="row">
 										<label for="tablecell">
-											<strong><?php _e( 'Member Since' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+											<strong><?php _e( 'Member Since', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 										</label>
 									</td>
-									<td><?php echo date( get_option('date_format') , strtotime( $account_details['member_since'] ) ); ?></td>
+									<td><?php echo date( get_option( 'date_format' ), strtotime( $account_details[ 'member_since' ] ) ); ?></td>
 								</tr>
 								<tr valign="top">
 									<td scope="row">
 										<label for="tablecell">
-											<strong><?php _e( 'Plan Type' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+											<strong><?php _e( 'Plan Type', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 										</label>
 									</td>
-									<td><?php echo ucwords( $account_details['pricing_plan_type'] ); ?></td>
+									<td><?php echo ucwords( $account_details[ 'pricing_plan_type' ] ); ?></td>
 								</tr>
 							</table>
 

admin/partials/menu/options.php

Spacing +24 added lines, -24 removed lines

@@ -5,13 +5,13 @@ 
 */
 
 	/* Get and Store Option Values */
-	if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) === 'valid_api_key' ) {
-		$api_connection = '<span id="connection-container" class="api-connected" title="' . __( "Your site is currently connected to the Mailchimp API" , "yikes-inc-easy-mailchimp-extender" ) . '"><span class="dashicons dashicons-yes yikes-mc-api-connected"></span> ' . __( "Connected" , 'yikes-inc-easy-mailchimp-extender' ) . '</span>';
+	if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) === 'valid_api_key' ) {
+		$api_connection = '<span id="connection-container" class="api-connected" title="' . __( "Your site is currently connected to the Mailchimp API", "yikes-inc-easy-mailchimp-extender" ) . '"><span class="dashicons dashicons-yes yikes-mc-api-connected"></span> ' . __( "Connected", 'yikes-inc-easy-mailchimp-extender' ) . '</span>';
 		$api_error_response = '';
 	} else {
-		$api_connection = '<span id="connection-container" class="api-not-connected"><span class="dashicons dashicons-no-alt yikes-mc-api-not-connected"></span>  ' . __( "Not Connected" , 'yikes-inc-easy-mailchimp-extender' ) . '</span>';
-		if( get_option( 'yikes-mc-api-invalid-key-response' , '' ) != '' ) {
-			$api_error_response = '<p><small><i class="dashicons dashicons-no-alt"></i> ' . get_option( 'yikes-mc-api-invalid-key-response' , '' ) . '</small></p>';
+		$api_connection = '<span id="connection-container" class="api-not-connected"><span class="dashicons dashicons-no-alt yikes-mc-api-not-connected"></span>  ' . __( "Not Connected", 'yikes-inc-easy-mailchimp-extender' ) . '</span>';
+		if ( get_option( 'yikes-mc-api-invalid-key-response', '' ) != '' ) {
+			$api_error_response = '<p><small><i class="dashicons dashicons-no-alt"></i> ' . get_option( 'yikes-mc-api-invalid-key-response', '' ) . '</small></p>';
 		} else {
 			$api_error_response = '';
 		}
@@ -23,23 +23,23 @@ 
 	* @since 6.2.2
 	*
 	*/
-	if ( isset( $_REQUEST['section'] ) ) {
-		$_REQUEST['section'] = preg_replace('/[^\w-]/', '', strip_tags ( $_REQUEST['section'] ) );
+	if ( isset( $_REQUEST[ 'section' ] ) ) {
+		$_REQUEST[ 'section' ] = preg_replace( '/[^\w-]/', '', strip_tags( $_REQUEST[ 'section' ] ) );
 	}
 ?>
 	<!-- Actual Settings Form -->
 	<div class="wrap yikes-easy-mc-wrap">
 
 		<!-- Freddie Logo -->
-		<img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - Mailchimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
+		<img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - Mailchimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
 
-		<h1>Easy Forms for Mailchimp | <?php if ( isset( $_REQUEST['section'] ) ) { echo ucwords( str_replace( '-', ' ', $_REQUEST['section'] ) ); } else { echo __( 'General Settings' , 'yikes-inc-easy-mailchimp-extender' ); } ?></h1>
+		<h1>Easy Forms for Mailchimp | <?php if ( isset( $_REQUEST[ 'section' ] ) ) { echo ucwords( str_replace( '-', ' ', $_REQUEST[ 'section' ] ) ); } else { echo __( 'General Settings', 'yikes-inc-easy-mailchimp-extender' ); } ?></h1>
 
 		<!-- Settings Page Description -->
-		<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Manage the overall settings for Easy forms for Mailchimp.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Manage the overall settings for Easy forms for Mailchimp.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 		<?php
 			/* Success Messages on Options Updated */
-			if( isset( $_REQUEST['settings-updated'] ) && $_REQUEST['settings-updated'] == 'true' ) {
+			if ( isset( $_REQUEST[ 'settings-updated' ] ) && $_REQUEST[ 'settings-updated' ] == 'true' ) {
 				?>
 				<div class="updated manage-form-admin-notice">
 					<p><?php _e( 'Settings successfully updated.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -47,7 +47,7 @@ 
 				<?php
 			}
 			/* Mailchimp API Cleared Successfully message */
-			if( isset( $_REQUEST['transient-cleared'] ) && $_REQUEST['transient-cleared'] == 'true' ) {
+			if ( isset( $_REQUEST[ 'transient-cleared' ] ) && $_REQUEST[ 'transient-cleared' ] == 'true' ) {
 				?>
 				<div class="updated manage-form-admin-notice">
 					<p><?php _e( 'Mailchimp API Cache successfully cleared.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -56,7 +56,7 @@ 
 			}
 			/* Error Log Clear Messages */
 				/* Success Messages on Options Updated */
-				if( isset( $_REQUEST['error-log-cleared'] ) && $_REQUEST['error-log-cleared'] == 'true' ) {
+				if ( isset( $_REQUEST[ 'error-log-cleared' ] ) && $_REQUEST[ 'error-log-cleared' ] == 'true' ) {
 					?>
 					<div class="updated manage-form-admin-notice">
 						<p><?php _e( 'Error log successfully cleared.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -64,7 +64,7 @@ 
 					<?php
 				}
 				/* Mailchimp API Cleared Successfully message */
-				if( isset( $_REQUEST['error-log-cleared'] ) && $_REQUEST['error-log-cleared'] == 'false' ) {
+				if ( isset( $_REQUEST[ 'error-log-cleared' ] ) && $_REQUEST[ 'error-log-cleared' ] == 'false' ) {
 					?>
 					<div class="error manage-form-admin-notice">
 						<p><?php _e( "Whoops! We've encountered an error while trying to clear the error log. Please refresh the page and try again. If the error persists please get in touch with the YIKES Inc. support team.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -73,28 +73,28 @@ 
 				}
 
 				/* Display a success message if our error log was sucessfully created, or display an error if not */
-				if( isset( $_GET['error_log_created'] ) && $_GET['error_log_created'] == 'true' ) {
+				if ( isset( $_GET[ 'error_log_created' ] ) && $_GET[ 'error_log_created' ] == 'true' ) {
 					?>
 					<div class="updated">
 						<p><?php _e( 'Error log successfully created. You may now start logging errors.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 					</div>
 					<?php
-				} else if( isset( $_GET['error_log_created'] ) && $_GET['error_log_created'] == 'false' ) {
+				} else if ( isset( $_GET[ 'error_log_created' ] ) && $_GET[ 'error_log_created' ] == 'false' ) {
 					?>
 					<div class="error">
-						<p><?php echo esc_attr( urldecode( $_GET['error_message'] ) , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+						<p><?php echo esc_attr( urldecode( $_GET[ 'error_message' ] ), 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 					</div>
 					<?php
 				}
 
 				/* Display a success message if the user successfully imported some forms */
-				if( isset( $_GET['section'] ) && $_GET['section'] == 'import-export-forms' && isset( $_GET['import-forms'] ) && $_GET['import-forms'] == 'true' ) {
+				if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'import-export-forms' && isset( $_GET[ 'import-forms' ] ) && $_GET[ 'import-forms' ] == 'true' ) {
 					?>
 					<div class="updated">
 						<p><?php printf( __( 'Opt-in forms successfully imported. <a href="%s" title="View Forms">View Forms</a>', 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?></p>
 					</div>
 					<?php
-				} elseif( isset( $_GET['section'] ) && $_GET['section'] == 'import-export-forms' && isset( $_GET['import-settings'] ) && $_GET['import-settings'] == 'true' ) {
+				} elseif ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'import-export-forms' && isset( $_GET[ 'import-settings' ] ) && $_GET[ 'import-settings' ] == 'true' ) {
 					?>
 					<div class="updated">
 						<p><?php printf( __( 'YIKES Easy Forms for Mailchimp settings successfully imported.', 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?></p>
@@ -115,11 +115,11 @@ 
 
 						<div class="postbox yikes-easy-mc-postbox">
 
-							<?php if( !isset( $_REQUEST['section'] ) || $_REQUEST['section'] == '' ) {
+							<?php if ( ! isset( $_REQUEST[ 'section' ] ) || $_REQUEST[ 'section' ] == '' ) {
 								include YIKES_MC_PATH . 'admin/partials/menu/options-sections/general-settings.php';
 							} else {
-								if( isset( $_REQUEST['addon'] ) && $_REQUEST['addon'] == 'true' ) {
-									include apply_filters( 'yikes-mailchimp-'.$_REQUEST['section'].'-options-path' , '' );
+								if ( isset( $_REQUEST[ 'addon' ] ) && $_REQUEST[ 'addon' ] == 'true' ) {
+									include apply_filters( 'yikes-mailchimp-' . $_REQUEST[ 'section' ] . '-options-path', '' );
 								} else {
 									// White list a set of files that are allowed to be included here
 									$file_base = 'admin/partials/menu/options-sections/';
@@ -132,8 +132,8 @@ 
 										$file_base . 'recaptcha-settings.php',
 									);
 									// Ensure the included file is allowed and whitelisted above, before including it
-									if ( 0 === validate_file( 'admin/partials/menu/options-sections/' . $_REQUEST['section'] . '.php', $acceptable_files ) ) {
-										include YIKES_MC_PATH . 'admin/partials/menu/options-sections/' . $_REQUEST['section'] . '.php';
+									if ( 0 === validate_file( 'admin/partials/menu/options-sections/' . $_REQUEST[ 'section' ] . '.php', $acceptable_files ) ) {
+										include YIKES_MC_PATH . 'admin/partials/menu/options-sections/' . $_REQUEST[ 'section' ] . '.php';
 									} else {
 										wp_die( esc_attr__( 'Invalid file. If this error persists, please contact support.', 'yikes-inc-easy-mailchimp' ) );
 									}

admin/partials/view-list.php

Spacing +71 added lines, -71 removed lines

@@ -1,9 +1,9 @@ 
 <?php
-if ( ! isset( $_REQUEST['list-id'] ) ) {
+if ( ! isset( $_REQUEST[ 'list-id' ] ) ) {
 	wp_die( __( 'Oops, we can\'t determine what List to view. Please go back and try again.' ) );
 }
 
-$list_id       = sanitize_key( $_REQUEST['list-id'] );
+$list_id       = sanitize_key( $_REQUEST[ 'list-id' ] );
 $list_helper   = yikes_get_mc_api_manager()->get_list_handler();
 $api_key       = yikes_get_mc_api_key();
 $dash_position = strpos( $api_key, '-' );
@@ -60,10 +60,10 @@ 
 }
 
 // setup pagination variables
-$paged			= isset( $_REQUEST['paged'] ) ? filter_var( $_REQUEST['paged'], FILTER_SANITIZE_NUMBER_INT ) : 0;
+$paged			= isset( $_REQUEST[ 'paged' ] ) ? filter_var( $_REQUEST[ 'paged' ], FILTER_SANITIZE_NUMBER_INT ) : 0;
 $limit			= apply_filters( 'yikes_admin_list_subscriber_limit', 20 );
-$page_offset	= (int) $paged * (int) $limit;
-$sort_dir		= isset( $_REQUEST['sort'] ) ? $_REQUEST['sort'] : 'DESC';
+$page_offset = (int) $paged * (int) $limit;
+$sort_dir = isset( $_REQUEST[ 'sort' ] ) ? $_REQUEST[ 'sort' ] : 'DESC';
 
 if ( $sort_dir === 'DESC' ) {
 	$opposite_sort_dir = 'ASC';
@@ -90,25 +90,25 @@ 
 ?>
 <div class="wrap yikes-easy-mc-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>
@@ -118,9 +118,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 submit_button( 'Add Subscriber' ); ?></p>
 		</form>
 	</section>
@@ -142,8 +142,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 -->
@@ -151,8 +151,8 @@ 
 									<!-- 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 -->
@@ -162,15 +162,15 @@ 
 										<?php if ( count( $subscribers_list ) > 0 ) {
 											$i = 1;
 											foreach ( $subscribers_list as $subscriber ) {
-												$user_id           = $subscriber['id'];
+												$user_id           = $subscriber[ 'id' ];
 												$path              = YIKES_MC_URL . "includes/images/na.png";
 												$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'; } ?>">
 													<td class="column-columnname">
-														<a class="user-email row-title" href="mailto:<?php echo sanitize_email( $subscriber['email_address'] ); ?>">
-															<?php echo sanitize_email( $subscriber['email_address'] ); ?>
+														<a class="user-email row-title" href="mailto:<?php echo sanitize_email( $subscriber[ 'email_address' ] ); ?>">
+															<?php echo sanitize_email( $subscriber[ 'email_address' ] ); ?>
 														</a>
 														<div class="row-actions">
 															<?php $view_user_info_url = esc_url_raw( add_query_arg( array(
@@ -184,17 +184,17 @@ 
 																'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_address'] ) ); ?>');" class="yikes-delete-subscriber"><?php _e( "Unsubscribe", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+															<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_address' ] ) ); ?>');" class="yikes-delete-subscriber"><?php _e( "Unsubscribe", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 														</div>
 													</td>
 													<td class="column-columnname num"><?php echo $email_client_icon; ?></td>
 												</tr>
 												<?php
-												$i ++;
+												$i++;
 											}
 											} 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>
@@ -206,11 +206,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>
 
@@ -225,21 +225,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' );
@@ -247,40 +247,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_field_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_field_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['campaign_defaults']['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[ 'campaign_defaults' ][ '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['campaign_defaults']['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[ 'campaign_defaults' ][ 'from_name' ]; ?></td>
 								</tr>
 							</table>
 
@@ -290,14 +290,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_fields['merge_fields'] ) >= 1 ) {
+								if ( count( $merge_fields[ 'merge_fields' ] ) >= 1 ) {
 									?><ul class="merge-variable-ul"><?php
-										echo '<li class="interest-group-count">' . sprintf( _n( '%d Field', '%d Fields', intval( count( $merge_fields['merge_fields'] ) ), 'yikes-inc-easy-mailchimp-extender' ), intval( count( $merge_fields['merge_fields'] ) ) ) . '</li>';
-										foreach( $merge_fields['merge_fields'] as $merge_field ) {
+										echo '<li class="interest-group-count">' . sprintf( _n( '%d Field', '%d Fields', intval( count( $merge_fields[ 'merge_fields' ] ) ), 'yikes-inc-easy-mailchimp-extender' ), intval( count( $merge_fields[ 'merge_fields' ] ) ) ) . '</li>';
+										foreach ( $merge_fields[ 'merge_fields' ] as $merge_field ) {
 											// new action hook @since 6.0.3.8
-											echo '<li class="' . $merge_field['tag'] . '"><span class="dashicons dashicons-marker"></span>' . $merge_field['name'] . ' ' . do_action( 'yikes-mailchimp-list-field', $merge_field ) . '</li>';
+											echo '<li class="' . $merge_field[ 'tag' ] . '"><span class="dashicons dashicons-marker"></span>' . $merge_field[ 'name' ] . ' ' . do_action( 'yikes-mailchimp-list-field', $merge_field ) . '</li>';
 										}
 									?></ul><?php
 								}
@@ -314,7 +314,7 @@ 
 						<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 ( ! empty( $interest_groupings ) ) {
 								?>
@@ -322,8 +322,8 @@ 
 								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 ) {
 									// Build up the total subscribers
-									$count = array_sum( wp_list_pluck( $interest_group['items'], 'subscriber_count' ) );
-									echo '<li><span class="dashicons dashicons-marker"></span>' . $interest_group['title'] . '<span class="interest-group-title"></span><small title="' . $count . ' ' . __( "subscribers assigned to this group", 'yikes-inc-easy-mailchimp-extender' ) . '">(' . $count . ')</small></li>';
+									$count = array_sum( wp_list_pluck( $interest_group[ 'items' ], 'subscriber_count' ) );
+									echo '<li><span class="dashicons dashicons-marker"></span>' . $interest_group[ 'title' ] . '<span class="interest-group-title"></span><small title="' . $count . ' ' . __( "subscribers assigned to this group", 'yikes-inc-easy-mailchimp-extender' ) . '">(' . $count . ')</small></li>';
 								}
 								?></ul><?php
 							} else {
@@ -347,17 +347,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
@@ -372,9 +372,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/class-yikes-inc-easy-mailchimp-extender-admin.php

Braces +220 added lines, -220 removed lines

@@ -9,7 +9,7 @@ 
  * @subpackage Yikes_Inc_Easy_Mailchimp_Forms/admin

  * @author     YIKES, Inc. <plugins@yikesinc.com>

  */

-class Yikes_Inc_Easy_Mailchimp_Forms_Admin {

+class Yikes_Inc_Easy_Mailchimp_Forms_Admin {
 

 	/**

 	 * The ID of this plugin.

@@ -49,7 +49,7 @@ 
 		$yikes_inc_easy_mailchimp_extender,

 		$version,

 		Yikes_Inc_Easy_Mailchimp_Extender_Form_Interface $form_interface

-	) {

+	) {
 		$this->yikes_inc_easy_mailchimp_extender = $yikes_inc_easy_mailchimp_extender;

 		$this->version                           = $version;

 		$this->form_interface                    = $form_interface;

@@ -60,7 +60,7 @@ 
 	 *

 	 * @author Jeremy Pry

 	 */

-	public function hooks() {

+	public function hooks() {
 

 		// Register admin pages.

 		add_action( 'admin_menu', array( $this, 'register_admin_pages' ), 11 );

@@ -92,7 +92,7 @@ 
 		/***********************/

 		/** Create A Form **/

 		/**********************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-form' ) {

+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-form' ) {
 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_form' ) );

 

@@ -101,7 +101,7 @@ 
 		/***********************/

 		/** Delete A Form **/

 		/**********************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-delete-form' ) {

+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-delete-form' ) {
 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_delete_form' ) );

 

@@ -110,7 +110,7 @@ 
 		/**********************************/

 		/** Duplicate/Clone A Form    **/

 		/********************************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-duplicate-form' ) {

+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-duplicate-form' ) {
 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_duplicate_form' ) );

 

@@ -119,7 +119,7 @@ 
 		/*************************************/

 		/**  Reset Form Impression Stats **/

 		/***********************************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-reset-stats' ) {

+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-reset-stats' ) {
 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_reset_impression_stats' ) );

 

@@ -128,7 +128,7 @@ 
 		/**********************************/

 		/**         Update A Form        **/

 		/********************************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-update-form' ) {

+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-update-form' ) {
 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_update_form' ) );

 

@@ -137,7 +137,7 @@ 
 		/**************************************************/

 		/**     Clear Store Mailchimp Transient Data   **/

 		/*************************************************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-transient-data' ) {

+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-transient-data' ) {
 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_transient_data' ) );

 

@@ -146,7 +146,7 @@ 
 		/*******************************************/

 		/** Remove a user from a mailing list     **/

 		/*****************************************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-unsubscribe-user' ) {

+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-unsubscribe-user' ) {
 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_unsubscribe_user' ) );

 

@@ -155,7 +155,7 @@ 
 		/*******************************************/

 		/**    Create misisng error log file  **/

 		/*****************************************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-error-log' ) {

+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-error-log' ) {
 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_missing_error_log' ) );

 

@@ -167,14 +167,14 @@ 
 		add_action( 'admin_head', array( $this, 'add_tinyMCE_buttons' ) );

 

 		// pass our lists data to tinyMCE button for use.

-		foreach ( array( 'post.php', 'post-new.php' ) as $hook ) {

+		foreach ( array( 'post.php', 'post-new.php' ) as $hook ) {
 

 			add_action( 'admin_enqueue_scripts', array( $this, 'tinymce_yikes_easy_mc' ) );

 

 		}

 

 		// display an admin notice for users on PHP < 5.3.

-		if ( phpversion() < '5.3' ) {

+		if ( phpversion() < '5.3' ) {
 			add_action( "admin_notices", array( $this, 'display_php_warning' ), 999 );

 		}

 

@@ -187,7 +187,7 @@ 
 		/**************************************************/

 		/**        Clear Mailchimp Error Log Data        **/

 		/*************************************************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-error-log' ) {

+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-error-log' ) {
 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_error_log' ) );

 

@@ -196,7 +196,7 @@ 
 		/*********************************************/

 		/**        Export Mailchimp Opt-in Forms   **/

 		/*******************************************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-forms' ) {

+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-forms' ) {
 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_forms' ) );

 

@@ -205,7 +205,7 @@ 
 		/*********************************************/

 		/**                Export Plugin Settings           **/

 		/*******************************************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-settings' ) {

+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-settings' ) {
 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_plugin_settings' ) );

 

@@ -214,7 +214,7 @@ 
 		/*******************************************/

 		/**        Import Class Inclusion       **/

 		/*****************************************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-import-forms' ) {

+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-import-forms' ) {
 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_import_forms' ) );

 

@@ -223,7 +223,7 @@ 
 		/*******************************************/

 		/**    Premium Support Request     **/

 		/*****************************************/

-		if ( isset( $_POST['submit-premium-support-request'] ) ) {

+		if ( isset( $_POST['submit-premium-support-request'] ) ) {
 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_premium_support_request' ) );

 

@@ -255,7 +255,7 @@ 
 		 * @ param  array  $links  Pre-existing plugin action links

 		 * @ return array  $links  New array of plugin actions

 		 */

-		public function easy_forms_plugin_action_links( $links ) {

+		public function easy_forms_plugin_action_links( $links ) {
 			$links[] = '<a href="'. esc_url( get_admin_url(null, 'admin.php?page=yikes-inc-easy-mailchimp-settings') ) .'">' . __( 'Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';

 			$links[] = '<a href="' . esc_url( 'http://www.yikesplugins.com?utm_source=plugins-page&utm_medium=plugin-row&utm_campaign=admin' ) . '" target="_blank">' . __( 'More plugins by YIKES, Inc.', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';

 			return $links;

@@ -271,13 +271,13 @@ 
 		 *

 		 * @return string

 		 */

-		public function yikes_easy_forms_admin_disclaimer( $footer_text ) {

+		public function yikes_easy_forms_admin_disclaimer( $footer_text ) {
 			$page = get_current_screen();

 			$base = $page->base;

-			if ( strpos( $base, 'yikes-inc-easy-mailchimp' ) !== false || strpos( $base, 'yikes-mailchimp' ) !== false ) {

+			if ( strpos( $base, 'yikes-inc-easy-mailchimp' ) !== false || strpos( $base, 'yikes-mailchimp' ) !== false ) {
 				$disclaimer_text = sprintf( '<em>' . __( 'Disclaimer: <strong>Easy Forms for Mailchimp</strong> is in no way endorsed, affiliated or backed by Mailchimp, or its parent company Rocket Science Group.', 'yikes-inc-easy-mailchimp-extender' ), '<a href="https://wordpress.org/support/view/plugin-reviews/give?filter=5#postform" target="_blank" class="give-rating-link" data-rated="' . __( 'Thanks :)', 'yikes-inc-easy-mailchimp-extender' ) . '">', '</a></em>' );

 				return $disclaimer_text;

-			} else {

+			} else {
 				return $footer_text;

 			}

 		}

@@ -289,32 +289,32 @@ 
 		*	@since 6.0.0

 		*	@return	parsed tag content

 		*/

-		public function parse_mailchimp_default_tag( $default_tag ) {

-			if ( ! $default_tag || $default_tag == '' ) {

+		public function parse_mailchimp_default_tag( $default_tag ) {
+			if ( ! $default_tag || $default_tag == '' ) {
 				return $default_tag;

 			}

 			global $post;

 			// page title.

-			if ( $default_tag == '{page_title}' ) {

+			if ( $default_tag == '{page_title}' ) {
 				$default_tag = get_the_title( $post->ID );

 			}

 			// page id.

-			if ( $default_tag == '{page_id}' ) {

+			if ( $default_tag == '{page_id}' ) {
 				$default_tag = $post->ID;

 			}

 			// page url.

-			if ( $default_tag == '{page_url}' ) {

+			if ( $default_tag == '{page_url}' ) {
 				$default_tag = get_permalink( $post->ID );

 			}

 			// blog name.

-			if ( $default_tag == '{blog_name}' ) {

+			if ( $default_tag == '{blog_name}' ) {
 				$default_tag = get_bloginfo( 'name' );

 			}

 			// is user logged in.

-			if ( $default_tag == '{user_logged_in}' ) {

-				if ( is_user_logged_in() ) {

+			if ( $default_tag == '{user_logged_in}' ) {
+				if ( is_user_logged_in() ) {
 					$default_tag = 'Registered User';

-				} else {

+				} else {
 					$default_tag = 'Guest User';

 				}

 			}

@@ -328,21 +328,21 @@ 
 		*	When a user clicks 'Clear Log' on the debug settings page, this funciton

 		*	is used to clear the data out of our php file.

 		*/

-		public function yikes_easy_mailchimp_clear_error_log() {

+		public function yikes_easy_mailchimp_clear_error_log() {
 

 			// Get our error log class.

 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();

 

 			// file put contents $returned error + other data.

-			if ( file_exists( $error_logging->error_log_file_path ) ) {

+			if ( file_exists( $error_logging->error_log_file_path ) ) {
 

 				$clear_log = file_put_contents( $error_logging->error_log_file_path, '' );

 

-				if ( $clear_log === false ) {

+				if ( $clear_log === false ) {
 

 					// redirect the user to the manage forms page, display error message.

 					wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error-log-cleared=false' ) ) );

-				} else {

+				} else {
 

 					// redirect the user to the manage forms page, display confirmation.

 					wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error-log-cleared=true' ) ) );

@@ -356,13 +356,13 @@ 
 		*	@since 		6.0.0

 		*	@return 	CSV export file

 		*/

-		public function yikes_easy_mailchimp_export_forms() {

+		public function yikes_easy_mailchimp_export_forms() {
 			// grab our nonce.

 			$nonce = $_REQUEST['nonce'];

 			// grab the forms.

 			$forms = isset( $_REQUEST['yikes_export_forms'] ) ? $_REQUEST['yikes_export_forms'] : array();

 			// validate nonce.

-			if ( ! wp_verify_nonce( $nonce, 'export-forms' ) ) {

+			if ( ! wp_verify_nonce( $nonce, 'export-forms' ) ) {
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );

 			}

 

@@ -380,11 +380,11 @@ 
 		*	@since 		6.0.0

 		*	@return 	CSV export file

 		*/

-		public function yikes_easy_mailchimp_export_plugin_settings() {

+		public function yikes_easy_mailchimp_export_plugin_settings() {
 			// grab our nonce

 			$nonce = $_REQUEST['nonce'];

 			// validate nonce.

-			if ( ! wp_verify_nonce( $nonce, 'export-settings' ) ) {

+			if ( ! wp_verify_nonce( $nonce, 'export-settings' ) ) {
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );

 			}

 

@@ -400,15 +400,15 @@ 
 		*	Custom import function to import all or specific forms

 		*	@since 6.0.0

 		*/

-		public function yikes_easy_mailchimp_import_forms() {

+		public function yikes_easy_mailchimp_import_forms() {
 			// grab our nonce.

 			$nonce = $_REQUEST['nonce'];

 			// validate nonce.

-			if ( ! wp_verify_nonce( $nonce, 'import-forms' ) ) {

+			if ( ! wp_verify_nonce( $nonce, 'import-forms' ) ) {
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );

 			}

 			// include the export class.

-			if ( ! class_exists( 'Yikes_Inc_Easy_Mailchimp_Import_Class' ) ) {

+			if ( ! class_exists( 'Yikes_Inc_Easy_Mailchimp_Import_Class' ) ) {
 				include_once( YIKES_MC_PATH . 'includes/import-export/yikes-easy-mailchimp-import.class.php' );

 			}

 			// run the import function.

@@ -424,9 +424,9 @@ 
 		*	Premium Support Request

 		*	@since 6.0.0

 		*/

-		public function yikes_easy_mailchimp_premium_support_request() {

+		public function yikes_easy_mailchimp_premium_support_request() {
 

-			if ( isset( $_POST['action'] ) && $_POST['action'] != 'yikes-support-request' ) {

+			if ( isset( $_POST['action'] ) && $_POST['action'] != 'yikes-support-request' ) {
 				return __( 'We encountered an error. Please contact the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' );

 			}

 

@@ -462,7 +462,7 @@ 
 			) );

 

 			// Catch the error.

-			if ( is_wp_error( $response ) ) {

+			if ( is_wp_error( $response ) ) {
 				wp_send_json_error( $response->getMessage() );

 			}

 

@@ -470,9 +470,9 @@ 
 			$response_body = json_decode( wp_remote_retrieve_body( $response ) );

 		}

 

-		public function get_premium_license( $plugin_slug ) {

+		public function get_premium_license( $plugin_slug ) {
 

-			switch( $plugin_slug ) {

+			switch( $plugin_slug ) {
 

 				case 'form-customizer':

 					return defined( 'YIKES_CUSTOMIZER_EDD_ITEM_ID' ) ? YIKES_CUSTOMIZER_EDD_ITEM_ID : '';

@@ -495,8 +495,8 @@ 
 		 *

 		 * @since 6.0.0

 		 */

-		public function load_error_logging_class() {

-			if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {

+		public function load_error_logging_class() {
+			if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 				// if error logging is enabled we should include our error logging class

 				/* Generate oure error logging table */

 				require_once YIKES_MC_PATH . '/includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';

@@ -511,21 +511,21 @@ 
 		 *

 		 * @since v6.0.0

 		 */

-		public function yikes_easy_mailchimp_check_installation_date() {

+		public function yikes_easy_mailchimp_check_installation_date() {
 

 			// add a new option to store the plugin activation date/time.

 			// @since v6.0.0.

 			// this is used to notify the user that they should review after 2 weeks.

-			if ( !get_option( 'yikes_easy_mailchimp_activation_date' ) ) {

+			if ( !get_option( 'yikes_easy_mailchimp_activation_date' ) ) {
 				add_option( 'yikes_easy_mailchimp_activation_date', strtotime( "now" ) );

 			}

 

 			$stop_bugging_me = get_option( 'yikes_easy_mailchimp_review_stop_bugging_me' );

 

-			if ( ! $stop_bugging_me ) {

+			if ( ! $stop_bugging_me ) {
 				$install_date = get_option( 'yikes_easy_mailchimp_activation_date' );

 				$past_date = strtotime( '-14 days' );

-				if ( $past_date >= $install_date && current_user_can( 'install_plugins' ) ) {

+				if ( $past_date >= $install_date && current_user_can( 'install_plugins' ) ) {
 					add_action( 'admin_notices', array( $this , 'yikes_easy_mailchimp_display_review_us_notice' ) );

 				}

 			}

@@ -537,9 +537,9 @@ 
 			asking for a review, and for user feedback

 			@since v6.0.0

 		*/

-		public function yikes_easy_mailchimp_display_review_us_notice() {

+		public function yikes_easy_mailchimp_display_review_us_notice() {
 			/* Lets only display our admin notice on YT4WP pages to not annoy the hell out of people :) */

-			if ( in_array( get_current_screen()->base , array( 'dashboard', 'post', 'edit' ) ) || strpos( get_current_screen()->base ,'yikes-inc-easy-mailchimp') !== false ) {

+			if ( in_array( get_current_screen()->base , array( 'dashboard', 'post', 'edit' ) ) || strpos( get_current_screen()->base ,'yikes-inc-easy-mailchimp') !== false ) {
 

 				// The URL of the page the user is currently on

 				$current_uri  	  = isset( $_SERVER['REQUEST_URI'] ) && ! empty( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] : false;

@@ -582,8 +582,8 @@ 
 			Remove the Review us notification when user clicks 'Dismiss'

 			@since v3.1.1

 		*/

-		public function yikes_easy_mailchimp_stop_bugging_me() {

-			if ( isset( $_GET['yikes_easy_mc_icons_nobug'] ) && (int) filter_var( $_GET['yikes_easy_mc_icons_nobug'], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {

+		public function yikes_easy_mailchimp_stop_bugging_me() {
+			if ( isset( $_GET['yikes_easy_mc_icons_nobug'] ) && (int) filter_var( $_GET['yikes_easy_mc_icons_nobug'], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {
 				add_option( 'yikes_easy_mailchimp_review_stop_bugging_me', true );

 			}

 		}

@@ -591,7 +591,7 @@ 
 	/* End Two Week Notification */

 

 		/* Display a warning users who are using PHP < 5.3 */

-		public function display_php_warning() {

+		public function display_php_warning() {
 			$message = __( 'Easy Forms for Mailchimp requires a minimum of PHP 5.3. The plugin will not function properly until you update. Please reach out to your host provider for assistance.', 'yikes-inc-easy-mailchimp-extender' );

 			echo "<div class='error'> <p><span class='dashicons dashicons-no-alt' style='color:rgb(231, 98, 98)'></span> $message</p></div>";

 		}

@@ -601,10 +601,10 @@ 
 	 * TinyMCE Functions

 	 */

 	// load our button and pass in the JS form data variable.

-	public function add_tinyMCE_buttons() {

+	public function add_tinyMCE_buttons() {
 		global $typenow;

 		// only on Post Type: post and page.

-		if ( ! in_array( $typenow, array( 'post', 'page' ) ) ) {

+		if ( ! in_array( $typenow, array( 'post', 'page' ) ) ) {
 			return;

 		}

 		add_filter( 'mce_buttons', array( $this, 'yks_mc_add_tinymce_button' ) );

@@ -612,14 +612,14 @@ 
 	}

 

 	// Add the button key for address via JS.

-	public function yks_mc_add_tinymce_button( $buttons ) {

+	public function yks_mc_add_tinymce_button( $buttons ) {
 		array_push( $buttons, 'yks_mc_tinymce_button_key' );

 		// Print all buttons.

 		return $buttons;

 	}

 

 	// inlcude the js for tinymce.

-	public function yks_mc_add_tinymce_plugin( $plugin_array ) {

+	public function yks_mc_add_tinymce_plugin( $plugin_array ) {
 

 		$plugin_array['yks_mc_tinymce_button'] = plugins_url( '/js/min/yikes-inc-easy-mailchimp-tinymce-button.min.js', __FILE__ );

 

@@ -631,23 +631,23 @@ 
 		 * Pass our imported list data, to the JS file

 		 * to build the drop down list in the modal

 		 */

-	public function tinymce_yikes_easy_mc() {

+	public function tinymce_yikes_easy_mc() {
 		// check capabilities.

-		if ( ! current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) {

+		if ( ! current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) {
 			return;

 		}

 

 		$list_data = $this->form_interface->get_all_forms();

 		$lists     = array();

-		if ( ! empty( $list_data ) ) {

+		if ( ! empty( $list_data ) ) {
 			// build an array to pass to our javascript.

-			foreach ( $list_data as $id => $form ) {

+			foreach ( $list_data as $id => $form ) {
 				$lists[] = array(

 					'text'  => urlencode( $form['form_name'] ),

 					'value' => $id,

 				);

 			}

-		} else {

+		} else {
 			$lists[0] = array(

 				'text'  => __( 'Please Import Some Mailchimp Lists', 'yikes-inc-easy-mailchimp-extender' ),

 				'value' => '-',

@@ -672,7 +672,7 @@ 
 	/**

 	 *  Fix the Mailchimp icon spacing in the admin menu.

 	 */

-	public function fix_menu_icon_spacing() {

+	public function fix_menu_icon_spacing() {
 		?>

 			<style>

 			a[href="admin.php?page=yikes-inc-easy-mailchimp"] .wp-menu-image img {

@@ -687,14 +687,14 @@ 
 	 *

 	 * @since 6.8.2

 	 */

-	public function maybe_enqueue_assets( $hook_suffix ) {

+	public function maybe_enqueue_assets( $hook_suffix ) {
 		// Enqueue styles on dashboard

-		if ( 'index.php' === $hook_suffix ) {

+		if ( 'index.php' === $hook_suffix ) {
 			$this->enqueue_styles();

 		}

 

 		// Enqueue styles and scripts on plugin admin pages

-		if ( strpos( $hook_suffix, 'yikes' ) !== false && strpos( $hook_suffix, 'mailchimp' ) !== false ) {

+		if ( strpos( $hook_suffix, 'yikes' ) !== false && strpos( $hook_suffix, 'mailchimp' ) !== false ) {
 			$this->enqueue_scripts();

 			$this->enqueue_styles();

 		}

@@ -705,7 +705,7 @@ 
 	 *

 	 * @since    6.0.0

 	 */

-	public function enqueue_styles() {

+	public function enqueue_styles() {
 		/**

 		 *	Enqueue our global dashboard styles.

 		 */

@@ -714,7 +714,7 @@ 
 		/*

 		*	Enqueue Add-ons styles.

 		*/

-		if ( get_current_screen()->base == 'easy-forms_page_yikes-inc-easy-mailchimp-addons' ) {

+		if ( get_current_screen()->base == 'easy-forms_page_yikes-inc-easy-mailchimp-addons' ) {
 			wp_enqueue_style( 'yikes-inc-easy-mailchimp-extender-addons-styles', plugin_dir_url( __FILE__ ) . 'css/yikes-inc-easy-mailchimp-extender-addons.min.css', array(), $this->version, 'all' );

 		}

 	}

@@ -723,7 +723,7 @@ 
 	 *

 	 * @since    6.0.0

 	 */

-	public function enqueue_scripts() {

+	public function enqueue_scripts() {
 		wp_enqueue_script( 'yikes-inc-easy-mailchimp-extender-admin-js', plugin_dir_url( __FILE__ ) . 'js/min/yikes-inc-easy-mailchimp-extender-admin.min.js', array( 'jquery', 'jquery-ui-sortable' ), $this->version, false );

 

 		$localized_data = array(

@@ -738,7 +738,7 @@ 
 

 		// Enqueue required scripts for the form editor

 		$screen = get_current_screen();

-		if ( ! isset( $screen->base ) || 'admin_page_yikes-mailchimp-edit-form' !== $screen->base ) {

+		if ( ! isset( $screen->base ) || 'admin_page_yikes-mailchimp-edit-form' !== $screen->base ) {
 			return;

 		}

 

@@ -786,12 +786,12 @@ 
 	/**

 	 * Convert the php date format string to a js date format

 	 */

-	public function yikes_jQuery_datepicker_date_format_php_to_js( $sFormat, $type ) {

-		switch ( $type ) {

+	public function yikes_jQuery_datepicker_date_format_php_to_js( $sFormat, $type ) {
+		switch ( $type ) {
 			default:

 			case 'date':

 				// Standard Date Fields

-				switch ( $sFormat ) {

+				switch ( $sFormat ) {
 					//Predefined WP date formats

 					case 'F j, Y':

 					case 'j F Y':

@@ -814,7 +814,7 @@ 
 				break;

 			// Birthday Fields

 			case 'birthday':

-				switch ( $sFormat ) {

+				switch ( $sFormat ) {
 					//Predefined WP date formats

 					case 'F j, Y':

 					case 'j F Y':

@@ -843,8 +843,8 @@ 
 	/**

 	 * Convert the php date format string to a js date format

 	 */

-	public function yikes_jQuery_datepicker_date_format( $site_option ) {

-		switch( $site_option ) {

+	public function yikes_jQuery_datepicker_date_format( $site_option ) {
+		switch( $site_option ) {
 			//Predefined WP date formats

 			default:

 			case 'F j, Y':

@@ -864,7 +864,7 @@ 
 	*	Register our admin pages

 	*	used to display data back to the user

 	**/

-	public function register_admin_pages() {

+	public function register_admin_pages() {
 

 		/* Top Level Menu 'Easy Mailchimp' */

 		add_menu_page(

@@ -977,7 +977,7 @@ 
 	*	when they click 'Go Pro' in the admin menu

 	*	to do: populate with sales URL

 	*/

-	public function generateAddOnsPage() {

+	public function generateAddOnsPage() {
 		require_once YIKES_MC_PATH . 'admin/partials/menu/add-ons.php'; // include our add-ons page

 	}

 

@@ -986,7 +986,7 @@ 
 	*

 	* @since    1.0.0

 	*/

-	function generateManageFormsPage() {

+	function generateManageFormsPage() {
 		require_once YIKES_MC_PATH . 'admin/partials/menu/manage-forms.php'; // include our manage forms page

 	}

 

@@ -995,7 +995,7 @@ 
 	*

 	* @since    1.0.0

 	*/

-	function generateManageListsPage() {

+	function generateManageListsPage() {
 		require_once YIKES_MC_PATH . 'admin/partials/menu/manage-lists.php'; // include our lists page

 	}

 

@@ -1004,7 +1004,7 @@ 
 	*

 	* @since    1.0.0

 	*/

-	function generateSupportPage() {

+	function generateSupportPage() {
 

 		wp_enqueue_script( 'yikes-inc-easy-mailchimp-extender-support-scripts', plugin_dir_url( __FILE__ ) . 'js/support.js', array( 'jquery' ), $this->version, false );

 		require_once YIKES_MC_PATH . 'admin/partials/menu/support.php';

@@ -1015,7 +1015,7 @@ 
 	*

 	* @since    1.0.0

 	*/

-	function generateEditFormPage() {

+	function generateEditFormPage() {
 		require_once YIKES_MC_PATH . 'admin/partials/edit-form.php'; // include our options page

 	}

 

@@ -1024,7 +1024,7 @@ 
 	*

 	* @since    1.0.0

 	*/

-	function generateViewListPage() {

+	function generateViewListPage() {
 		require_once YIKES_MC_PATH . 'admin/partials/view-list.php'; // include our options page

 	}

 

@@ -1033,7 +1033,7 @@ 
 	*

 	* @since    1.0.0

 	*/

-	function generateViewUserPage() {

+	function generateViewUserPage() {
 		require_once YIKES_MC_PATH . 'admin/partials/view-user.php'; // include our options page

 	}

 

@@ -1042,7 +1042,7 @@ 
 	*

 	* @since v.5.4

 	**/

-	function yikes_easy_mc_settings_init() {

+	function yikes_easy_mc_settings_init() {
 

 		/* Register General Settings Section */

 

@@ -1188,27 +1188,27 @@ 
 	*	Options Sanitization & Validation

 	*	@since complete re-write

 	**/

-	function yikes_mc_validate_api_key( $input ) {

-		if ( $input === '' ) {

+	function yikes_mc_validate_api_key( $input ) {
+		if ( $input === '' ) {
 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );

 			return '';

 		}

 		$api_key = strip_tags ( trim( $input ) );

 		$dash_position = strpos( trim( $input ), '-' );

-		if ( $dash_position !== false ) {

+		if ( $dash_position !== false ) {
 			$manager = new Yikes_Inc_Easy_Mailchimp_API_Manager( $api_key );

-		} else {

+		} else {
 			update_option( 'yikes-mc-api-invalid-key-response', __( 'Your API key appears to be invalid.', 'yikes-inc-easy-mailchimp-extender' ) );

 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );

 			return $api_key;

 		}

 

 		$response = $manager->get_account_handler()->get_account( false );

-		if ( ! is_wp_error( $response ) ) {

+		if ( ! is_wp_error( $response ) ) {
 			update_option( 'yikes-mc-api-validation', 'valid_api_key' );

 				// Clear the API key transient data

 			$this->delete_yikes_mailchimp_transients();

-		}  else {

+		} else {
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();

 			$error_logging->yikes_easy_mailchimp_write_to_error_log( $response->get_error_message() , __( "Connecting to Mailchimp" , 'yikes-inc-easy-mailchimp-extender' ) , __( "Settings Page/General Settings" , 'yikes-inc-easy-mailchimp-extender' ) );

 			update_option( 'yikes-mc-api-invalid-key-response', $response->get_error_message() );

@@ -1223,7 +1223,7 @@ 
 	*

 	* @since    1.0.0

 	*/

-	function generatePageOptions() {

+	function generatePageOptions() {
 		require_once YIKES_MC_PATH . 'admin/partials/menu/options.php'; // include our options page

 	}

 

@@ -1233,15 +1233,15 @@ 
 	*	to form fields. (input, dropdowns, buttons etc.)

 	* 	@since v5.5 re-write

 	**/

-	public function is_user_mc_api_valid_form( $echo = true ) {

-		if ( $echo == true ) {

-			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {

+	public function is_user_mc_api_valid_form( $echo = true ) {
+		if ( $echo == true ) {
+			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
 				echo 'disabled="disabled"';

 			}

-		} else {

-			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {

+		} else {
+			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
 				return false;

-			} else {

+			} else {
 				return true;

 			}

 		}

@@ -1257,9 +1257,9 @@ 
 		*	and return the index ( used to find the list name assigned to a form )

 		*	- http://stackoverflow.com/questions/6661530/php-multi-dimensional-array-search

 		*/

-		function findMCListID($id, $array) {

-		   foreach ($array as $key => $val) {

-			   if ($val['id'] === $id) {

+		function findMCListID($id, $array) {
+		   foreach ($array as $key => $val) {
+			   if ($val['id'] === $id) {
 				   return $key;

 			   }

 		   }

@@ -1271,8 +1271,8 @@ 
 		*	Render our sidebar menu on all of the setings pages (general, form, checkbox, recaptcha, popup, debug etc. )

 		*	@since v5.6 - complete re-write

 		*/

-		public function generate_options_pages_sidebar_menu() {

-			if ( isset( $_REQUEST['section'] ) ) {

+		public function generate_options_pages_sidebar_menu() {
+			if ( isset( $_REQUEST['section'] ) ) {
 				$selected = $_REQUEST['section'];

 			}

 			$installed_addons = get_option( 'yikes-easy-mc-active-addons', array() );

@@ -1299,13 +1299,13 @@ 
 					</ul>

 					<?php

 						// create our add-on settings pages

-						if ( !empty( $installed_addons ) ) {

+						if ( !empty( $installed_addons ) ) {
 							?>

 							<hr class="add-on-settings-divider" />

 							<strong><?php _e( 'Addon Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>

 							<ul id="addon-settings-nav">

 							<?php

-							foreach( $installed_addons as $addon_name ) {

+							foreach( $installed_addons as $addon_name ) {
 								?>

 									<li>

 										<?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] ==  $addon_name ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => $addon_name, 'addon' => 'true' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section='.$addon_name ) ) ); ?>"><?php echo ucwords( str_replace( '-', ' ', $addon_name ) ); ?></a></li>

@@ -1325,7 +1325,7 @@ 
 		*	Render our sidebar menu on all of the setings pages (general, form, checkbox, recaptcha, popup, debug etc. )

 		*	@since v5.6 - complete re-write

 		*/

-		public function generate_manage_forms_sidebar( $lists ) {

+		public function generate_manage_forms_sidebar( $lists ) {
 			// create a custom URL to allow for creating fields

 			$url = esc_url_raw(

 				add_query_arg(

@@ -1356,18 +1356,18 @@ 
 					<label for="associated-list"><strong><?php _e( 'Associated List', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>

 						<select name="associated-list" id="associated-list" class=" input-field" <?php $this->is_user_mc_api_valid_form( true ); disabled( true, empty( $lists ) ); ?>>

 							<?php

-							if ( ! empty( $lists ) ) {

-								foreach( $lists as $mailing_list ) {

+							if ( ! empty( $lists ) ) {
+								foreach( $lists as $mailing_list ) {
 									?>

 									<option value="<?php echo $mailing_list['id']; ?>"><?php echo stripslashes( $mailing_list['name'] ) . ' (' . $mailing_list['stats']['member_count'] . ') '; ?></option>

 									<?php

 								}

-							} else {

-								if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {

+							} else {
+								if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
 									?>

 									<option><?php echo __( "Please enter a valid API key." , 'yikes-inc-easy-mailchimp-extender' ); ?></option>

 									<?php

-								} else {

+								} else {
 									?>

 									<option><?php echo __( "No lists were found on the account." , 'yikes-inc-easy-mailchimp-extender' ); ?></option>

 									<?php

@@ -1378,8 +1378,8 @@ 
 						</select>

 

 						<?php

-						if ( isset( $_GET['transient-cleared'] ) ) {

-							if ( 'true' === $_GET['transient-cleared'] ) {

+						if ( isset( $_GET['transient-cleared'] ) ) {
+							if ( 'true' === $_GET['transient-cleared'] ) {
 								?>

 								<div class="yikes-list-refreshed-notice">

 									<p><?php esc_attr_e( 'Mailchimp list data has been succesfully refreshed.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>

@@ -1388,8 +1388,8 @@ 
 							}

 						}

 

-						if ( isset( $lists ) && empty( $lists ) ) {

-							if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'invalid_api_key' ) {

+						if ( isset( $lists ) && empty( $lists ) ) {
+							if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'invalid_api_key' ) {
 								?>

 									<p class="description">

 										<?php printf( __( 'Head over to <a href="http://www.Mailchimp.com" title="%s">Mailchimp</a> to create a new list.', 'yikes-inc-easy-mailchimp-extender' ) , __( 'Create a list', 'yikes-inc-easy-mailchimp-extender' ) ); ?>

@@ -1400,9 +1400,9 @@ 
 						?>

 					</label>

 					<?php

-						if ( $this->is_user_mc_api_valid_form( false ) ) {

+						if ( $this->is_user_mc_api_valid_form( false ) ) {
 							echo submit_button( __( 'Create', 'yikes-inc-easy-mailchimp-extender' ) , 'primary', '', false , array( 'style' => 'margin:.75em 0 .5em 0;' ) );

-						} else {

+						} else {
 							echo '<p class="description">' . __( "Please enter a valid Mailchimp API key to get started." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>';

 							?>

 								<a href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&settings-updated=true' ) ); ?>"><?php _e( 'general settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a>

@@ -1413,7 +1413,7 @@ 
 

 				<!-- Clear API CACHE -->

 				<?php

-				if ( isset( $lists ) && ! empty( $lists ) ) {

+				if ( isset( $lists ) && ! empty( $lists ) ) {
 					if ( false !== get_transient( 'yikes-easy-mailchimp-list-data' ) ) { ?>

 						<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-clear-transient-data', 'nonce' => wp_create_nonce( 'clear-mc-transient-data' ) ) ) ); ?>" method="post">

 							<input type="submit" class="button-secondary clear-mailchimp-api-cache" value="<?php _e( 'Refresh Lists', 'yikes-inc-easy-mailchimp-extender' ); ?>" />

@@ -1429,7 +1429,7 @@ 
 		*	Generate a dropdown of post and pages

 		*	so the user can send the user to on form submission

 		*/

-		public function generate_page_redirect_dropdown( $redirect, $redirect_page, $custom_redirect_url ) {

+		public function generate_page_redirect_dropdown( $redirect, $redirect_page, $custom_redirect_url ) {
 				$post_types = get_post_types();

 				?>

 				<label id="redirect-user-to-selection-label" for="redirect-user-to-selection" class="<?php if ( $redirect == '0' ) { echo 'yikes-easy-mc-hidden'; } ?>">

@@ -1449,10 +1449,10 @@ 
 					$excluded_post_types = apply_filters( 'yikes-mailchimp-excluded-redirect-post-types', $excluded_post_types );

 

 						// loop over registered post types, and query!

-						foreach( $post_types as $registered_post_type ) {

+						foreach( $post_types as $registered_post_type ) {
 

 							// exclude a few built in custom post types and any defined by the filter

-							if ( ! in_array( $registered_post_type, $excluded_post_types ) ) {

+							if ( ! in_array( $registered_post_type, $excluded_post_types ) ) {
 

 								// Grab only the post IDs - in the past we've created timeout issues on some servers with lots of posts

 								$wp_query_args = array(

@@ -1467,11 +1467,11 @@ 
 

 								$post_ids = ! empty( $wp_query_result->posts ) ? $wp_query_result->posts : array();

 

-								if ( ! empty ( $post_ids ) ) {

+								if ( ! empty ( $post_ids ) ) {
 									?>

 										<optgroup label="<?php echo ucwords( str_replace( '_', ' ', $registered_post_type ) ); ?>">

 									<?php

-											foreach( $post_ids as $post_id ) {

+											foreach( $post_ids as $post_id ) {
 												?><option <?php selected( $redirect_page , $post_id ); ?> value="<?php echo $post_id; ?>"><?php echo get_the_title( $post_id ) ?></option><?php

 											}

 									?>

@@ -1502,15 +1502,15 @@ 
 		*

 		* 	Displayed in sidebars

 		*/

-		public function generate_show_some_love_container() {

+		public function generate_show_some_love_container() {
 			// if no active add-ons are installed,

 			// lets display our branding and add-on sidebar

 			$options = get_option( 'yikes-easy-mc-active-addons', array() );

-			if ( empty( $options ) ) {

+			if ( empty( $options ) ) {
 

 				/* On Edit Forms Page Display Upsell to Customizer */

 				$screen = get_current_screen();

-				if ( isset( $screen ) && $screen->base == 'admin_page_yikes-mailchimp-edit-form' ) {

+				if ( isset( $screen ) && $screen->base == 'admin_page_yikes-mailchimp-edit-form' ) {
 				?>

 

 					<div class="postbox yikes-easy-mc-postbox show-some-love-container">

@@ -1588,18 +1588,18 @@ 
 		*	-

 		* @parameters - $list_id - pass in the list ID to retreive merge variables from

 		*/

-		public function generate_form_editor( $form_fields, $list_id, $merge_variables, $interest_groups ) {

+		public function generate_form_editor( $form_fields, $list_id, $merge_variables, $interest_groups ) {
 

 			// if no list id, die!

-			if ( ! $list_id ) {

+			if ( ! $list_id ) {
 				wp_die( __( "We've encountered an error. No list ID was sent." , 'yikes-inc-easy-mailchimp-extender' ) );

 			}

 

-			if ( ! $merge_variables ) {

+			if ( ! $merge_variables ) {
 				wp_die( __( "We've encountered an error. Reload the page and try again. If the error persists, please reach out to support." , 'yikes-inc-easy-mailchimp-extender' ) );

 			}

 

-			if ( ! empty( $form_fields ) ) {

+			if ( ! empty( $form_fields ) ) {
 

 				// find any fields that are assigned to this form, that don't exist in Mailchimp

 				// or else were going to run into issues when we submit the form

@@ -1611,18 +1611,18 @@ 
 				$mailchimp_merge_field_ids	= array();

 

 				// loop over merge variables

-				if ( ! empty( $merge_variables['merge_fields'] ) ) {

+				if ( ! empty( $merge_variables['merge_fields'] ) ) {
 					$available_merge_variables = wp_list_pluck( $merge_variables['merge_fields'], 'tag' );

 					$mailchimp_merge_field_ids = wp_list_pluck( $merge_variables['merge_fields'], 'merge_id' );

 

 					// Array will look like $merge_tag => $merge_id

-					foreach( $available_merge_variables as $index => $merge_tag ) {

+					foreach( $available_merge_variables as $index => $merge_tag ) {
 						$merge_field_ids[$merge_tag] = $mailchimp_merge_field_ids[$index];

 					}

 				}

 

 				// loop over interest groups

-				if ( ! empty( $interest_groups ) ) {

+				if ( ! empty( $interest_groups ) ) {
 					$available_interest_groups = array_keys( $interest_groups );

 				}

 

@@ -1631,14 +1631,14 @@ 
 				$merged_fields   = array_merge( $available_merge_variables, $available_interest_groups );

 				$excluded_fields = array_diff( $assigned_fields, $merged_fields );

 

-				$form_fields = array_filter($form_fields, function($field){

+				$form_fields = array_filter($form_fields, function($field) {
 					return isset($field['type']);

 				});

 

 				$i = 1;

-				foreach( $form_fields as $field ) {

+				foreach( $form_fields as $field ) {
 

-					if ( isset( $field['merge'] ) ) {

+					if ( isset( $field['merge'] ) ) {
 						// @todo: don't use in_array()

 						$excluded_field = in_array( $field['merge'], $excluded_fields, true );

 						?>

@@ -1672,7 +1672,7 @@ 
 									<input type="hidden" class="yikes-mc-merge-field-id" name="field[<?php echo $field['merge']; ?>][id]" value="<?php echo $merge_field_ids[ $field['merge'] ] ?>" />

 								<?php } ?>

 

-								<?php if ( $field['type'] == 'radio' || $field['type'] == 'dropdown' || $field['type'] == 'select' ) {

+								<?php if ( $field['type'] == 'radio' || $field['type'] == 'dropdown' || $field['type'] == 'select' ) {
 									$choices = json_decode( $field['choices'], true );

 								?>

 									<input type="hidden" name="field[<?php echo $field['merge']; ?>][choices]" value='<?php echo esc_attr( json_encode( $choices ) ); ?>' />

@@ -1696,7 +1696,7 @@ 
 										</tr>

 

 										<!-- Placeholder Value -->

-										<?php switch( $field['type'] ) {

+										<?php switch( $field['type'] ) {
 

 											case 'text':

 											case 'email':

@@ -1743,7 +1743,7 @@ 
 										?>

 

 										<!-- Default Value -->

-										<?php switch( $field['type'] ) {

+										<?php switch( $field['type'] ) {
 											default:

 											case 'text':

 											case 'number':

@@ -1759,7 +1759,7 @@ 
 													<input id="default_value_<?php echo esc_attr( $field['merge'] ); ?>" <?php if ( $field['type'] != 'number' ) { ?> type="text" <?php } else { ?> type="number" <?php } ?> class="widefat" name="field[<?php echo $field['merge']; ?>][default]" <?php if ( $field['type'] != 'url' ) { ?> value="<?php echo isset( $field['default'] ) ? stripslashes( wp_strip_all_tags( $field['default'] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $field['default'] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $field['default'] ) ) ) : ''; ?>" <?php } ?> />

 													<p class="description"><small><?php _e( "Assign a default value to populate this field with on initial page load.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>

 													<?php

-													switch( $field['type'] ) {

+													switch( $field['type'] ) {
 														case 'text':

 															?>

 																<p><small class="pre-defined-tag-link"><a href="#TB_inline?width=600&height=550&inlineId=pre-defined-tag-container" onclick="storeGlobalClicked( jQuery( this ) );" class="thickbox"><?php _e( 'View Pre-Defined Tags', 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p>

@@ -1928,7 +1928,7 @@ 
 										<!-- Display Phone/Date Formats back to the user -->

 										<!-- Phone Format Initial Load -->

 										<?php

-											switch( $field['type'] ) {

+											switch( $field['type'] ) {
 												/* Store the phone format, for properly regex pattern */

 												case 'phone':

 												case 'birthday':

@@ -1938,7 +1938,7 @@ 
 															<td scope="row">

 																<label for="placeholder">

 																	<?php

-																		switch( $field['type'] ) {

+																		switch( $field['type'] ) {
 																			default:

 																			case 'birthday':

 																				$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );

@@ -1999,7 +1999,7 @@ 
 

 

 

-					} else {

+					} else {
 

 						/**** Interest Group ****/

 

@@ -2032,7 +2032,7 @@ 
 

 									<table class="form-table form-field-container">

 										<!-- Default Value -->

-										<?php switch( $field['type'] ) {

+										<?php switch( $field['type'] ) {
 											default:

 											case 'radio':

 											case 'checkboxes':

@@ -2049,7 +2049,7 @@ 
 

 														$default_shown = false;

 

-														foreach ( json_decode( $field['groups'], true ) as $id => $group ) {

+														foreach ( json_decode( $field['groups'], true ) as $id => $group ) {
 															$field_id   = "{$field['group_id']}-{$id}";

 															$field_type = 'hidden' == $field['type'] ? 'checkbox' : $field['type'];

 															$field_type = 'checkboxes' == $field_type ? 'checkbox' : $field_type;

@@ -2058,7 +2058,7 @@ 
 

 															// Determine if the current group is checked.

 															$checked = '';

-															switch ( $field_type ) {

+															switch ( $field_type ) {
 																case 'radio':

 																default:

 																	$default = is_array( $field['default_choice'] ) ? current( $field['default_choice'] ) : $field['default_choice'];

@@ -2067,14 +2067,14 @@ 
 

 																case 'checkbox':

 																case 'hidden':

-																	if ( is_array( $field['default_choice'] ) && in_array( $id, $field['default_choice'] ) ) {

+																	if ( is_array( $field['default_choice'] ) && in_array( $id, $field['default_choice'] ) ) {
 																		$checked = checked( true, true, false );

 																	}

 																break;

 															}

 

 															// Allow users to not set a default choice for radio buttons.

-															if ( $field_type === 'radio' && $default_shown === false ) {

+															if ( $field_type === 'radio' && $default_shown === false ) {
 																$default_shown = true;

 																?>

 																<label for="<?php echo $field_id . 'no-default'; ?>">

@@ -2239,7 +2239,7 @@ 
 						<?php

 					}

 				}

-			} else {

+			} else {
 				?>

 					<h4 class="no-fields-assigned-notice non-draggable-yikes"><em><?php _e( 'No fields are assigned to this form. Select fields from the right hand column to add to this form.', 'yikes-inc-easy-mailchimp-extender' ); ?></em></h4>

 				<?php

@@ -2326,18 +2326,18 @@ 
 		 *	-

 		 * @parameters - $list_id - pass in the list ID to retreive merge variables from

 		 */

-		public function build_available_merge_vars( $form_fields, $available_merge_variables ) {

+		public function build_available_merge_vars( $form_fields, $available_merge_variables ) {
 			$fields_assigned_to_form = array();

-			foreach ( $form_fields as $field ) {

-				if ( isset( $field['merge'] ) ) {

+			foreach ( $form_fields as $field ) {
+				if ( isset( $field['merge'] ) ) {
 					$fields_assigned_to_form[ $field['merge'] ] = true;

 				}

 			}

 

-			if ( ! empty( $available_merge_variables['merge_fields'] ) ) {

+			if ( ! empty( $available_merge_variables['merge_fields'] ) ) {
 				?>

 				<ul id="available-fields"><?php

-				foreach ( $available_merge_variables['merge_fields'] as $merge_var ) {

+				foreach ( $available_merge_variables['merge_fields'] as $merge_var ) {
 					$not_available = isset( $fields_assigned_to_form[ $merge_var['tag'] ] );

 					?>

 					<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>"

@@ -2350,7 +2350,7 @@ 
 					>

 						<?php

 							echo esc_html( stripslashes( $merge_var['name'] ) );

-							if ( $merge_var['required'] ) {

+							if ( $merge_var['required'] ) {
 								echo ' <span class="field-required" title="' . __( 'required field', 'yikes-inc-easy-mailchimp-extender' ) . '">*</span>';

 							}

 						?>

@@ -2375,21 +2375,21 @@ 
 		 *	-

 		 * @parameters - $list_id - pass in the list ID to retreive merge variables from

 		 */

-		public function build_available_interest_groups( $form_fields, $available_interest_groups, $list_id ) {

+		public function build_available_interest_groups( $form_fields, $available_interest_groups, $list_id ) {
 			$fields_assigned_to_form = array();

-			if ( ! empty( $form_fields ) ) {

-				foreach ( $form_fields as $field ) {

-					if ( isset( $field['group_id'] ) ) {

+			if ( ! empty( $form_fields ) ) {
+				foreach ( $form_fields as $field ) {
+					if ( isset( $field['group_id'] ) ) {
 						$fields_assigned_to_form[ $field['group_id'] ] = true;

 					}

 				}

 			}

 

-			if ( ! empty( $available_interest_groups ) ) {

+			if ( ! empty( $available_interest_groups ) ) {
 			?>

 				<ul id="available-interest-groups">

 				<?php

-					foreach ( $available_interest_groups as $interest_group ) {

+					foreach ( $available_interest_groups as $interest_group ) {
 						$not_available = isset( $fields_assigned_to_form[ $interest_group['id'] ] );

 						?>

 						<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>"

@@ -2420,11 +2420,11 @@ 
 		/**

 		 * Smt.

 		 */

-		public function build_available_tags( $form_tags, $tags, $list_id ) {

+		public function build_available_tags( $form_tags, $tags, $list_id ) {
 			?>

 			<ul id="available-tags">

 			<?php

-			foreach ( $tags as $tag_id => $tag ) {

+			foreach ( $tags as $tag_id => $tag ) {
 				$not_available = isset( $form_tags[ $tag_id ] );

 				?>

 				<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>"

@@ -2454,9 +2454,9 @@ 
 		*	and include it here for easy maintenance

 		*	- must clean up db tables , ensure what data is going in and what is needed...

 		*/

-		public function yikes_easy_mailchimp_create_form() {

+		public function yikes_easy_mailchimp_create_form() {
 			$nonce = $_REQUEST['nonce'];

-			if ( ! wp_verify_nonce( $nonce, 'create_mailchimp_form' ) ) {

+			if ( ! wp_verify_nonce( $nonce, 'create_mailchimp_form' ) ) {
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) );

 			}

 

@@ -2467,13 +2467,13 @@ 
 			) );

 

 			// if an error occurs during the form creation process

-			if ( false == $result ) {

+			if ( false == $result ) {
 				// write it to the error log

 				// if the form was not created successfully

 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();

 				$error_logging->maybe_write_to_log( __( 'Error creating a new form', 'yikes-inc-easy-mailchimp-extender') , __( "Creating a new form" , 'yikes-inc-easy-mailchimp-extender' ) , __( "Forms" , 'yikes-inc-easy-mailchimp-extender' ) );

 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&sql_error=' . urlencode( __( 'Error creating a new form', 'yikes-inc-easy-mailchimp-extender' ) ) ) ) );

-			} else {

+			} else {
 				// redirect the user to the new form edit page

 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $result) ) );

 			}

@@ -2486,12 +2486,12 @@ 
 		*	and include it here for easy maintenance

 		*	- must clean up db tables , ensure what data is going in and what is needed...

 		*/

-		public function yikes_easy_mailchimp_delete_form() {

+		public function yikes_easy_mailchimp_delete_form() {
 			// grab & store our variables ( associated list & form name )

 			$nonce = $_REQUEST['nonce'];

 			$post_id_to_delete = $_REQUEST['mailchimp-form'];

 			// verify our nonce

-			if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-'.$post_id_to_delete ) ) {

+			if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-'.$post_id_to_delete ) ) {
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );

 			}

 

@@ -2506,12 +2506,12 @@ 
 		*	Duplicate an entire form !

 		*	Probably Move these to its own file,

 		*/

-		public function yikes_easy_mailchimp_duplicate_form() {

+		public function yikes_easy_mailchimp_duplicate_form() {
 			// grab & store our variables ( associated list & form name )

 			$nonce = $_REQUEST['nonce'];

 			$post_id_to_clone = $_REQUEST['mailchimp-form'];

 			// verify our nonce

-			if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-'.$post_id_to_clone ) ) {

+			if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-'.$post_id_to_clone ) ) {
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );

 			}

 

@@ -2535,10 +2535,10 @@ 
 			*/

 			do_action( 'yikes-mailchimp-after-duplicating-form', $post_id_to_clone, $result, $form_data );

 

-			if ( false === $result ) {

+			if ( false === $result ) {
 				// redirect the user to the manage forms page, display error

 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&duplicated-form=false' ) ) );

-			} else {

+			} else {
 				// redirect the user to the manage forms page, display confirmation

 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&duplicated-form=true' ) ) );

 			}

@@ -2549,12 +2549,12 @@ 
 		/*

 		*	Reset a forms impression stats

 		*/

-		public function yikes_easy_mailchimp_reset_impression_stats() {

+		public function yikes_easy_mailchimp_reset_impression_stats() {
 			// grab & store our variables ( associated list & form name )

 			$nonce = $_REQUEST['nonce'];

 			$form_id_to_reset = $_REQUEST['mailchimp-form'];

 			// verify our nonce

-			if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-'.$form_id_to_reset ) ) {

+			if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-'.$form_id_to_reset ) ) {
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );

 			}

 

@@ -2566,10 +2566,10 @@ 
 				)

 			);

 

-			if ( false === $result ) {

+			if ( false === $result ) {
 				// redirect the user to the manage forms page, display error

 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&reset-stats=false' ) ) );

-			} else {

+			} else {
 				// redirect the user to the manage forms page, display confirmation

 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&reset-stats=true' ) ) );

 			}

@@ -2581,13 +2581,13 @@ 
 		*	Update an entire form !

 		*	Probably Move these to its own file,

 		*/

-		public function yikes_easy_mailchimp_update_form() {

+		public function yikes_easy_mailchimp_update_form() {
 

 			$nonce   = $_REQUEST['nonce'];

 			$form_id = $_REQUEST['id'];

 

 			// verify our nonce

-			if ( ! wp_verify_nonce( $nonce, 'update-mailchimp-form-' . $form_id ) ) {

+			if ( ! wp_verify_nonce( $nonce, 'update-mailchimp-form-' . $form_id ) ) {
 				wp_die(

 					__( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ),

 					__( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ),

@@ -2660,11 +2660,11 @@ 
 

 			// additional custom fields (extensions / user defined fields)

 			$custom_fields = array();

-			if ( isset( $_POST['custom-field'] ) ) {

-				foreach ( $_POST['custom-field'] as $custom_field => $custom_value ) {

-					if ( is_array( $custom_value ) ) {

+			if ( isset( $_POST['custom-field'] ) ) {
+				foreach ( $_POST['custom-field'] as $custom_field => $custom_value ) {
+					if ( is_array( $custom_value ) ) {
 						$custom_fields[ $custom_field ] = array_filter( stripslashes_deep( $custom_value ) ); // array_filters to remove empty items (don't save them!)

-					} else {

+					} else {
 						$custom_fields[ $custom_field ] = stripslashes( $custom_value );

 					}

 				}

@@ -2700,7 +2700,7 @@ 
 			exit();

 		}

 

-		public static function generate_default_email_body() {

+		public static function generate_default_email_body() {
 			$email_body  = '<p>' . __( 'Greetings,', 'yikes-inc-easy-mailchimp-extender' ) . '</p>';

 

 			$email_body .= '<p>';

@@ -2723,18 +2723,18 @@ 
 		}

 

 		/* Unsubscribe a given user from our list */

-		public function yikes_easy_mailchimp_unsubscribe_user() {

+		public function yikes_easy_mailchimp_unsubscribe_user() {
 			$nonce    = $_REQUEST['nonce'];

 			$list_id  = $_REQUEST['mailchimp-list'];

 			$email_id = $_REQUEST['email_id'];

 

 			// verify our nonce

-			if ( ! wp_verify_nonce( $nonce, 'unsubscribe-user-' . $email_id ) ) {

+			if ( ! wp_verify_nonce( $nonce, 'unsubscribe-user-' . $email_id ) ) {
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );

 			}

 

 			$response = yikes_get_mc_api_manager()->get_list_handler()->member_unsubscribe( $list_id, $email_id );

-			if ( is_wp_error( $response ) ) {

+			if ( is_wp_error( $response ) ) {
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();

 				$error_logging->maybe_write_to_log(

 					$response->get_error_code(),

@@ -2747,22 +2747,22 @@ 
 			exit;

 		}

 

-		public function yikes_easy_mailchimp_create_missing_error_log() {

+		public function yikes_easy_mailchimp_create_missing_error_log() {
 			// grab our nonnce

 			$nonce = $_REQUEST['nonce'];

 			// validate nonce

-			if ( !wp_verify_nonce( $nonce, 'create_error_log' ) ) {

+			if ( !wp_verify_nonce( $nonce, 'create_error_log' ) ) {
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );

 			}

 			// setup the path to the error log

 			$error_log = fopen( plugin_dir_path( __FILE__ ) . '../includes/error_log/yikes-easy-mailchimp-error-log.php', 'w' );

-			try {

+			try {
 				// create the file

 				fwrite( $error_log , '' );

 				// close out

 				fclose( $error_log );

 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error_log_created=true' ) ) );

-			} catch ( Exception $e ) {

+			} catch ( Exception $e ) {
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error_log_created=false&error_message='.urlencode( $e->getMessage() ) ) ) );

 			}

 		}

@@ -2771,11 +2771,11 @@ 
 		*	Clear Transient Data !

 		*	Probably Move these to its own file,

 		*/

-		public function yikes_easy_mailchimp_clear_transient_data() {

+		public function yikes_easy_mailchimp_clear_transient_data() {
 

 			// verify our nonce

 			$nonce = $_REQUEST['nonce'];

-			if ( ! wp_verify_nonce( $nonce, 'clear-mc-transient-data' ) ) {

+			if ( ! wp_verify_nonce( $nonce, 'clear-mc-transient-data' ) ) {
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );

 			}

 

@@ -2783,14 +2783,14 @@ 
 

 			// if the request came from the settings page, redirect to the settings page.

 			$referer = wp_get_referer();

-			if ( $referer && ( strpos( $referer, 'yikes-inc-easy-mailchimp-settings' ) > 0 ) ) {

+			if ( $referer && ( strpos( $referer, 'yikes-inc-easy-mailchimp-settings' ) > 0 ) ) {
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=api-cache-settings&transient-cleared=true' ) ) );

-			} elseif ( isset( $_REQUEST['page'] ) && $_REQUEST['page'] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST['id'] ) && ! empty( $_REQUEST['id'] ) ) {

+			} elseif ( isset( $_REQUEST['page'] ) && $_REQUEST['page'] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST['id'] ) && ! empty( $_REQUEST['id'] ) ) {
 

 				// else check if we were editing a form.

 				$id = filter_var( $_REQUEST['id'], FILTER_SANITIZE_NUMBER_INT );

 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $id ) ) );

-			} else {

+			} else {
 				// else redirect to the manage forms page.

 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&transient-cleared=true' ) ) );

 			}

@@ -2806,17 +2806,17 @@ 
 		 * @since 6.0.2

 		 * @return $list_id_array - array of list id's to loop over

 		 */

-		public function get_mailchimp_list_ids_on_account() {

+		public function get_mailchimp_list_ids_on_account() {
 			$api_key = yikes_get_mc_api_key();

-			if ( ! $api_key ) {

+			if ( ! $api_key ) {
 				// if no api key is set/site is not connected, return an empty array.

 				return array();

 			}

 

 			$lists = get_transient( 'yikesinc_eme_list_ids' );

-			if ( false === $lists ) {

+			if ( false === $lists ) {
 				$lists = yikes_get_mc_api_manager()->get_list_handler()->get_list_ids();

-				if ( is_wp_error( $lists ) ) {

+				if ( is_wp_error( $lists ) ) {
 					return array();

 				}

 				set_transient( 'yikesinc_eme_list_ids', $lists, HOUR_IN_SECONDS );

@@ -2830,9 +2830,9 @@ 
 		 *

 		 *	@since 6.0

 		 */

-		public function yikes_mailchimp_load_helper_class() {

+		public function yikes_mailchimp_load_helper_class() {
 			// check to see if it's already loaded up.

-			if ( !class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {

+			if ( !class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {
 				// Include our main helper class file

 				include_once( YIKES_MC_PATH . 'admin/partials/helpers/init.php' );

 			}

@@ -2845,11 +2845,11 @@ 
 		 * @order requires that yikes-inc-easy-mailchimp-extender-admin.min.css be enqueued, so we can override the defaults (handle: yikes-inc-easy-mailchimp-extender-admin)

 		 * @return print out custom styles to the admin header to alter the default blue color

 		 */

-		public function alter_yikes_easy_mc_color_scheme() {

+		public function alter_yikes_easy_mc_color_scheme() {
 			// get the current set color scheme for the logged in user

 			$current_color_scheme = get_user_option( 'admin_color' );

 			// switch over each color scheme, and set our variable

-			switch ( $current_color_scheme ) {

+			switch ( $current_color_scheme ) {
 				default:

 				case 'fresh': // default blue (defined by this plugin)

 					$main_color = '#00a0d2';

@@ -2897,16 +2897,16 @@ 
 		/**

 		 *	Display premium support page if any add-ons are installed, otherwise display free support page

 		 */

-		public function display_support_page_content() {

+		public function display_support_page_content() {
 

 			$addons = get_option( 'yikes-easy-mc-active-addons', array() );

 

 			// If we have premium add-ons...

-			if ( ! empty( $addons ) ) {

+			if ( ! empty( $addons ) ) {
 

 				// Add our premium support partial.

 				include_once( YIKES_MC_PATH . 'admin/partials/helpers/premium-support.php' );

-			} else {

+			} else {
 

 				// Otherwise add our free support partial.

 				include_once( YIKES_MC_PATH . 'admin/partials/helpers/free-support.php' );

@@ -2918,8 +2918,8 @@ 
 		 *

 		 * @since 6.0.4

 		 */

-		public function check_yikes_mc_table_version() {

-			if ( get_option( 'yikes_mc_database_version', '0.00' ) < '1.0' ) {

+		public function check_yikes_mc_table_version() {
+			if ( get_option( 'yikes_mc_database_version', '0.00' ) < '1.0' ) {
 				require_once YIKES_MC_PATH . 'includes/class-yikes-inc-easy-mailchimp-extender-activator.php';

 				global $wpdb;

 				Yikes_Inc_Easy_Mailchimp_Extender_Activator::_activate_yikes_easy_mailchimp( $wpdb );

@@ -2933,7 +2933,7 @@ 
 		 *

 		 * @since 6.0.4.4

 		 */

-		public function process_subscriber_count_shortcode_in_form_descriptions( $form_description, $form_id ) {

+		public function process_subscriber_count_shortcode_in_form_descriptions( $form_description, $form_id ) {
 			$form_description = str_replace( '[yikes-mailchimp-subscriber-count]', do_shortcode( '[yikes-mailchimp-subscriber-count form="' . $form_id . '"]' ), $form_description );

 			return $form_description;

 		}

@@ -2943,9 +2943,9 @@ 
 		 *

 		 * @since 6.0.3

 		 */

-		public function generate_edit_forms_upsell_ad() {

+		public function generate_edit_forms_upsell_ad() {
 		$upsell_ads = glob( YIKES_MC_PATH . 'includes/upsells/*.php' );

-		if ( $upsell_ads && ! empty( $upsell_ads ) ) {

+		if ( $upsell_ads && ! empty( $upsell_ads ) ) {
 			$ad_count = absint( count( $upsell_ads ) - 1 );

 			$ad       = $upsell_ads[ mt_rand( 0, $ad_count ) ];

 			ob_start();

@@ -2962,11 +2962,11 @@ 
 		 * Mainly used when the API key is altered, changed or removed.

 		 * @since 6.1.3

 		 */

-		public function delete_yikes_mailchimp_transients() {

+		public function delete_yikes_mailchimp_transients() {
 

 		// delete all of the list_id transients.

 		$list_ids = $this->get_mailchimp_list_ids_on_account();

-		foreach ( $list_ids as $id ) {

+		foreach ( $list_ids as $id ) {
 			delete_transient( "yikes_eme_list_{$id}" );

 			delete_transient( "yikes_eme_merge_variables_{$id}" );

 			delete_transient( "yikes_eme_interest_categories_{$id}" );

@@ -2988,7 +2988,7 @@ 
 	 *

 	 * @author Jeremy Pry

 	 */

-	public function register_optin_widget() {

+	public function register_optin_widget() {
 		register_widget( 'Yikes_Inc_Easy_Mailchimp_Extender_Widget' );

 	}

 }

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

Braces +9 added lines, -9 removed lines

@@ -25,7 +25,7 @@ 
  * @subpackage Yikes_Inc_Easy_Mailchimp_Extender/includes

  * @author     YIKES Inc. <plugins@yikesinc.com>

  */

-class Yikes_Inc_Easy_Mailchimp_Extender {

+class Yikes_Inc_Easy_Mailchimp_Extender {
 	/**

 	 * The loader that's responsible for maintaining and registering all hooks that power

 	 * the plugin.

@@ -70,7 +70,7 @@ 
 	 *

 	 * @param Yikes_Inc_Easy_Mailchimp_Extender_Form_Interface $form_interface

 	 */

-	public function __construct( Yikes_Inc_Easy_Mailchimp_Extender_Form_Interface $form_interface ) {

+	public function __construct( Yikes_Inc_Easy_Mailchimp_Extender_Form_Interface $form_interface ) {
 		$this->version = YIKES_MC_VERSION;

 		$this->form_interface = $form_interface;

 		$this->load_dependencies();

@@ -93,7 +93,7 @@ 
 	 * @since    1.0.0

 	 * @access   private

 	 */

-	private function load_dependencies() {

+	private function load_dependencies() {
 		/**

 		 * The class responsible for orchestrating the actions and filters of the

 		 * core plugin.

@@ -121,7 +121,7 @@ 
 	 * @since    1.0.0

 	 * @access   private

 	 */

-	private function define_admin_hooks() {

+	private function define_admin_hooks() {
 		$plugin_admin = new Yikes_Inc_Easy_Mailchimp_Forms_Admin( $this->get_yikes_inc_easy_mailchimp_extender(), $this->get_version(), $this->form_interface );

 		$plugin_admin->hooks();

 		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'maybe_enqueue_assets' );

@@ -133,7 +133,7 @@ 
 	 * @since    1.0.0

 	 * @access   private

 	 */

-	private function define_public_hooks() {

+	private function define_public_hooks() {
 		$plugin_public = new Yikes_Inc_Easy_Mailchimp_Extender_Public( $this->get_yikes_inc_easy_mailchimp_extender(), $this->get_version() );

 	}

 	/**

@@ -141,7 +141,7 @@ 
 	 *

 	 * @since    1.0.0

 	 */

-	public function run() {

+	public function run() {
 		$this->loader->run();

 	}

 	/**

@@ -151,7 +151,7 @@ 
 	 * @since     1.0.0

 	 * @return    string    The name of the plugin.

 	 */

-	public function get_yikes_inc_easy_mailchimp_extender() {

+	public function get_yikes_inc_easy_mailchimp_extender() {
 		return $this->yikes_inc_easy_mailchimp_extender;

 	}

 	/**

@@ -160,7 +160,7 @@ 
 	 * @since     1.0.0

 	 * @return    Yikes_Inc_Easy_Mailchimp_Extender_Loader    Orchestrates the hooks of the plugin.

 	 */

-	public function get_loader() {

+	public function get_loader() {
 		return $this->loader;

 	}

 	/**

@@ -169,7 +169,7 @@ 
 	 * @since     1.0.0

 	 * @return    string    The version number of the plugin.

 	 */

-	public function get_version() {

+	public function get_version() {
 		return $this->version;

 	}

 }