yikesinc / yikes-inc-easy-mailchimp-extender

admin/partials/menu/account-details.php

Spacing +56 added lines, -56 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 	// lets confirm the user has a valid API key stored
-	if( $this->is_user_mc_api_valid_form( false ) == 'valid' ) {
+	if ( $this->is_user_mc_api_valid_form( false ) == 'valid' ) {
 		// store the API key
 		$api_key = yikes_get_mc_api_key();
 		$dash_position = strpos( $api_key, '-' );
 		/// Check for a transients, if not - set them up
 		if ( false === ( $profile_info = get_transient( 'yikes-easy-mailchimp-profile-data' ) ) ) {
-			if( $dash_position !== false ) {
+			if ( $dash_position !== false ) {
 				$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/users/profile.json';
 			}
 			$profile_info = wp_remote_post( $api_endpoint, array(
@@ -17,11 +17,11 @@ 
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
 			$profile_info = json_decode( wp_remote_retrieve_body( $profile_info ), true );
-			if( isset( $profile_info['error'] ) ) {
-				if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+			if ( isset( $profile_info[ 'error' ] ) ) {
+				if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 					require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 					$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-					$error_logging->yikes_easy_mailchimp_write_to_error_log( $profile_info['error'], __( "Get Profile Info." , 'yikes-inc-easy-mailchimp-extender' ), "Account Details Page" );
+					$error_logging->yikes_easy_mailchimp_write_to_error_log( $profile_info[ 'error' ], __( "Get Profile Info.", 'yikes-inc-easy-mailchimp-extender' ), "Account Details Page" );
 				}
 				return;
 			} else {
@@ -30,7 +30,7 @@ 
 			}
 		}
 		if ( false === ( $account_details = get_transient( 'yikes-easy-mailchimp-account-data' ) ) ) {
-			if( $dash_position !== false ) {
+			if ( $dash_position !== false ) {
 				$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/helper/account-details.json';
 			}
 			$account_details = wp_remote_post( $api_endpoint, array(
@@ -41,11 +41,11 @@ 
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
 			$account_details = json_decode( wp_remote_retrieve_body( $account_details ), true );
-			if( isset( $account_details['error'] ) ) {
-				if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+			if ( isset( $account_details[ 'error' ] ) ) {
+				if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 					require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 					$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-					$error_logging->yikes_easy_mailchimp_write_to_error_log( $account_details['error'], __( "Get Account Details" , 'yikes-inc-easy-mailchimp-extender' ), "Account Details Page" );
+					$error_logging->yikes_easy_mailchimp_write_to_error_log( $account_details[ 'error' ], __( "Get Account Details", 'yikes-inc-easy-mailchimp-extender' ), "Account Details Page" );
 				}
 			} else {
 				// set our transient for one hour
@@ -54,7 +54,7 @@ 
 		}
 		if ( false === ( $account_activity = get_transient( 'yikes-easy-mailchimp-account-activity' ) ) ) {
 			// retreive our list data
-			if( $dash_position !== false ) {
+			if ( $dash_position !== false ) {
 				$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/helper/chimp-chatter.json';
 			}
 			$account_activity = wp_remote_post( $api_endpoint, array(
@@ -65,11 +65,11 @@ 
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
 			$account_activity = json_decode( wp_remote_retrieve_body( $account_activity ), true );
-			if( isset( $account_activity['error'] ) ) {
-				if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+			if ( isset( $account_activity[ 'error' ] ) ) {
+				if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 					require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 					$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-					$error_logging->yikes_easy_mailchimp_write_to_error_log( $account_activity['error'], __( "Get Chimp Chatter" , 'yikes-inc-easy-mailchimp-extender' ), "Account Details Page" );
+					$error_logging->yikes_easy_mailchimp_write_to_error_log( $account_activity[ 'error' ], __( "Get Chimp Chatter", 'yikes-inc-easy-mailchimp-extender' ), "Account Details Page" );
 				}
 			} else {
 				// set our transient for one hour
@@ -77,16 +77,16 @@ 
 			}
 		}
 	} else {
-		wp_die( __( 'It looks like you need to re-validate your MailChimp API key before you can continue.' , 'yikes-inc-easy-mailchimp-extender' ) , 500 );
+		wp_die( __( 'It looks like you need to re-validate your MailChimp API key before you can continue.', 'yikes-inc-easy-mailchimp-extender' ), 500 );
 	}
 ?>
 <div class="wrap" id="account-details">
 	<!-- Freddie Logo -->
-	<img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - MailChimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
+	<img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - MailChimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
 
-	<h1><?php _e( 'Account Overview' , 'yikes-inc-easy-mailchimp-extender' ); echo ' | ' . $profile_info['username']; ?></h1>
+	<h1><?php _e( 'Account Overview', 'yikes-inc-easy-mailchimp-extender' ); echo ' | ' . $profile_info[ 'username' ]; ?></h1>
 	<!-- Account Overview Page Description -->
-	<p class="yikes-easy-mc-about-text about-text"><?php _e( "Below you'll find a brief overview of account activity as well as some account and profile info." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+	<p class="yikes-easy-mc-about-text about-text"><?php _e( "Below you'll find a brief overview of account activity as well as some account and profile info.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
 	<div id="poststuff">
 		<div id="post-body" class="metabox-holder columns-2">
@@ -96,16 +96,16 @@ 
 					<!-- <div class="postbox yikes-easy-mc-postbox" id="chimp-chatter">
 						<div class="inside"> -->
 
-							<h1><?php _e( 'Chimp Chatter' , 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
+							<h1><?php _e( 'Chimp Chatter', 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
 
 							<?php
 								$date_format = get_option( 'date_format' );
 								$time_format = get_option( 'time_format' );
 								$x = 1;
 								$end = count( $account_activity );
-								foreach( $account_activity as $activity ) {
-									$split_type = explode( ':',str_replace('-',' ',$activity['type']));
-									switch( $activity['type'] ) {
+								foreach ( $account_activity as $activity ) {
+									$split_type = explode( ':', str_replace( '-', ' ', $activity[ 'type' ] ) );
+									switch ( $activity[ 'type' ] ) {
 										case 'lists:new-subscriber':
 										case 'lists:profile-updates':
 										case 'campaigns:facebook-likes':
@@ -123,60 +123,60 @@ 
 											$section_class = 'chimp-chatter-neutral';
 											break;
 									}
-									if( $x < 5 ) {
+									if ( $x < 5 ) {
 									?>
 										<!--- <section class="chimp-chatter-container <?php echo esc_attr( $section_class ); ?>">
-											<div class="chatter-type"><?php echo ucwords( $split_type[1] ); ?></div>
+											<div class="chatter-type"><?php echo ucwords( $split_type[ 1 ] ); ?></div>
 											<p class="chatter-message description">
-												<?php echo $activity['message']; ?>
+												<?php echo $activity[ 'message' ]; ?>
 											</p>
 											<p class="chatter-time">
-												<?php echo get_date_from_gmt( $activity['update_time'], 'F jS, Y h:i a' ); ?>
+												<?php echo get_date_from_gmt( $activity[ 'update_time' ], 'F jS, Y h:i a' ); ?>
 											</p>
 										</section> -->
 
-										<section class="postbox yikes-easy-mc-postbox chimp-chatter-postbox <?php echo esc_attr( $section_class ); if( $x % 2 == 0 ) { echo ' even'; } ?>">
+										<section class="postbox yikes-easy-mc-postbox chimp-chatter-postbox <?php echo esc_attr( $section_class ); if ( $x % 2 == 0 ) { echo ' even'; } ?>">
 											<div class="inside">
-												<div class="chatter-type"><?php echo ucwords( $split_type[1] ); ?></div>
+												<div class="chatter-type"><?php echo ucwords( $split_type[ 1 ] ); ?></div>
 												<p class="chatter-message description">
-													<?php echo $activity['message']; ?>
+													<?php echo $activity[ 'message' ]; ?>
 												</p>
 												<p class="chatter-time">
-													<?php echo get_date_from_gmt( $activity['update_time'], 'F jS, Y h:i a' ); ?>
+													<?php echo get_date_from_gmt( $activity[ 'update_time' ], 'F jS, Y h:i a' ); ?>
 												</p>
 											</div>
 										</section>
 									<?php
 									} else {
-										if( $x == 7 ) {
+										if ( $x == 7 ) {
 											?>
 												<div id="hidden-chatter" class="yikes-easy-mc-hidden">
 											<?php
 										}
 										?>
 												<!-- <section class="chimp-chatter-container <?php echo esc_attr( $section_class ); ?>">
-													<div class="chatter-type"><?php echo ucwords( $split_type[1] ); ?></div>
+													<div class="chatter-type"><?php echo ucwords( $split_type[ 1 ] ); ?></div>
 													<p class="chatter-message description">
-														<?php echo $activity['message']; ?>
+														<?php echo $activity[ 'message' ]; ?>
 													</p>
 													<p class="chatter-time">
-														<?php echo get_date_from_gmt( $activity['update_time'], 'F jS, Y h:i a' ); ?>
+														<?php echo get_date_from_gmt( $activity[ 'update_time' ], 'F jS, Y h:i a' ); ?>
 													</p>
 												</section> -->
 
-												<section class="postbox yikes-easy-mc-postbox chimp-chatter-postbox <?php echo esc_attr( $section_class ); if( $x % 2 == 0 ) { echo ' even'; } ?>">
+												<section class="postbox yikes-easy-mc-postbox chimp-chatter-postbox <?php echo esc_attr( $section_class ); if ( $x % 2 == 0 ) { echo ' even'; } ?>">
 													<div class="inside">
-														<div class="chatter-type"><?php echo ucwords( $split_type[1] ); ?></div>
+														<div class="chatter-type"><?php echo ucwords( $split_type[ 1 ] ); ?></div>
 														<p class="chatter-message description">
-															<?php echo $activity['message']; ?>
+															<?php echo $activity[ 'message' ]; ?>
 														</p>
 														<p class="chatter-time">
-															<?php echo get_date_from_gmt( $activity['update_time'], 'F jS, Y h:i a' ); ?>
+															<?php echo get_date_from_gmt( $activity[ 'update_time' ], 'F jS, Y h:i a' ); ?>
 														</p>
 													</div>
 												</section>
 										<?php
-										if( $x == $end ) {
+										if ( $x == $end ) {
 											?>
 												</div>
 											<?php
@@ -187,7 +187,7 @@ 
 								?>
 
 								<div class="chimpchatter-button-container">
-									<a href="#" onclick="jQuery(this).parents().find('#hidden-chatter').slideToggle();jQuery(this).fadeOut();return false;" class="button-primary"><?php _e( 'View All Activity' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+									<a href="#" onclick="jQuery(this).parents().find('#hidden-chatter').slideToggle();jQuery(this).fadeOut();return false;" class="button-primary"><?php _e( 'View All Activity', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 								</div>
 
 						<!-- </div> -->
@@ -208,8 +208,8 @@ 
 					<div class="postbox yikes-easy-mc-postbox">
 						<div class="inside">
 
-							<a href="https://us3.admin.mailchimp.com/" title="<?php _e( 'MailChimp Site' , 'yikes-inc-easy-mailchimp-extender' ); ?>" target="_blank">
-								<img src="<?php echo YIKES_MC_URL . 'includes/images/Welcome_Page/mailchimp-logo.png'; ?>" title="<?php _e( 'MailChimp Site' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="chimp-chatter-mailchimp-logo">
+							<a href="https://us3.admin.mailchimp.com/" title="<?php _e( 'MailChimp Site', 'yikes-inc-easy-mailchimp-extender' ); ?>" target="_blank">
+								<img src="<?php echo YIKES_MC_URL . 'includes/images/Welcome_Page/mailchimp-logo.png'; ?>" title="<?php _e( 'MailChimp Site', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="chimp-chatter-mailchimp-logo">
 							</a>
 
 						</div>
@@ -219,60 +219,60 @@ 
 					<div class="postbox yikes-easy-mc-postbox chimp-chatter-sidebar">
 						<div class="inside">
 
-							<h2 class="account-status"><?php if( $account_details['has_activated'] == 1 ) { ?><div class="circle-account-active" title="<?php _e( "Account Active" , 'yikes-inc-easy-mailchimp-extender' ); ?>"></div><?php } else { ?><div class="circle-account-inactive" title="<?php _e( "Account Inactive" , 'yikes-inc-easy-mailchimp-extender' ); ?>"></div><?php } echo $profile_info['name']; ?> <small>(<?php echo $profile_info['role']; ?>)</small></h2>
+							<h2 class="account-status"><?php if ( $account_details[ 'has_activated' ] == 1 ) { ?><div class="circle-account-active" title="<?php _e( "Account Active", 'yikes-inc-easy-mailchimp-extender' ); ?>"></div><?php } else { ?><div class="circle-account-inactive" title="<?php _e( "Account Inactive", 'yikes-inc-easy-mailchimp-extender' ); ?>"></div><?php } echo $profile_info[ 'name' ]; ?> <small>(<?php echo $profile_info[ 'role' ]; ?>)</small></h2>
 
-							<img class="mailchimp-avatar" src="<?php echo esc_url_raw( $profile_info['avatar'] ); ?>" title="<?php echo $profile_info['username'] . ' ' . __( "MailChimp avatar" , 'yikes-inc-easy-mailchimp-extender' ); ?>">
+							<img class="mailchimp-avatar" src="<?php echo esc_url_raw( $profile_info[ 'avatar' ] ); ?>" title="<?php echo $profile_info[ 'username' ] . ' ' . __( "MailChimp avatar", 'yikes-inc-easy-mailchimp-extender' ); ?>">
 
 							<table class="form-table" id="account-details-table">
 								<tr valign="top">
 									<td scope="row">
 										<label for="tablecell">
-											<strong><?php _e( 'Company' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+											<strong><?php _e( 'Company', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 										</label>
 									</td>
-									<td><?php echo $account_details['contact']['company']; ?><br /><?php echo $account_details['contact']['city'] . ', ' . $account_details['contact']['state']; ?></td>
+									<td><?php echo $account_details[ 'contact' ][ 'company' ]; ?><br /><?php echo $account_details[ 'contact' ][ 'city' ] . ', ' . $account_details[ 'contact' ][ 'state' ]; ?></td>
 								</tr>
 								<tr valign="top">
 									<td scope="row">
 										<label for="tablecell">
-											<strong><?php _e( 'Industry' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+											<strong><?php _e( 'Industry', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 										</label>
 									</td>
-									<td><?php echo $account_details['industry']; ?></td>
+									<td><?php echo $account_details[ 'industry' ]; ?></td>
 								</tr>
 								<tr valign="top">
 									<td scope="row">
 										<label for="tablecell">
-											<strong><?php _e( 'Member Since' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+											<strong><?php _e( 'Member Since', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 										</label>
 									</td>
-									<td><?php echo date( get_option('date_format') , strtotime( $account_details['member_since'] ) ); ?></td>
+									<td><?php echo date( get_option( 'date_format' ), strtotime( $account_details[ 'member_since' ] ) ); ?></td>
 								</tr>
 								<tr valign="top">
 									<td scope="row">
 										<label for="tablecell">
-											<strong><?php _e( 'Plan Type' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+											<strong><?php _e( 'Plan Type', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 										</label>
 									</td>
-									<td><?php echo ucwords( $account_details['plan_type'] ); ?></td>
+									<td><?php echo ucwords( $account_details[ 'plan_type' ] ); ?></td>
 								</tr>
-								<?php if( $account_details['plan_type'] == 'payasyougo' || $account_details['plan_type'] == 'free' ) { ?>
+								<?php if ( $account_details[ 'plan_type' ] == 'payasyougo' || $account_details[ 'plan_type' ] == 'free' ) { ?>
 								<tr valign="top">
 									<td scope="row">
 										<label for="tablecell">
-											<strong><?php _e( 'Emails Left' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+											<strong><?php _e( 'Emails Left', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 										</label>
 									</td>
-									<td><?php echo number_format( $account_details['emails_left'] ); ?></td>
+									<td><?php echo number_format( $account_details[ 'emails_left' ] ); ?></td>
 								</tr>
 								<?php } ?>
 								<tr valign="top">
 									<td scope="row">
 										<label for="tablecell">
-											<strong><?php _e( 'Affiliate Link' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+											<strong><?php _e( 'Affiliate Link', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 										</label>
 									</td>
-									<td><a href="#" onclick="jQuery(this).hide().next().fadeIn('fast');return false;" class="button-secondary"><?php _e( 'View Link', 'yikes-inc-easy-mailchimp-extender' ); ?></a><input type="text" class="widefat mailchimp-affiliate-link" readonly value="<?php echo esc_url_raw( $account_details['affiliate_link'] ); ?>" onclick="jQuery(this).select();return false;"></td>
+									<td><a href="#" onclick="jQuery(this).hide().next().fadeIn('fast');return false;" class="button-secondary"><?php _e( 'View Link', 'yikes-inc-easy-mailchimp-extender' ); ?></a><input type="text" class="widefat mailchimp-affiliate-link" readonly value="<?php echo esc_url_raw( $account_details[ 'affiliate_link' ] ); ?>" onclick="jQuery(this).select();return false;"></td>
 								</tr>
 							</table>
 

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

Spacing +5 added lines, -5 removed lines

@@ -8,7 +8,7 @@ 
 $yikes_mc_api_constant = ( defined( 'YIKES_MC_API_KEY' ) ) ? true : false;
 ?>
 
-<h3><span><?php _e( 'General Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span><?php echo $api_connection; ?></h3>
+<h3><span><?php _e( 'General Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span><?php echo $api_connection; ?></h3>
 <div class="inside">
 
 	<!-- Settings Form -->
@@ -21,11 +21,11 @@ 
 		<!-- MailChimp API Input Field -->
 		<label for="yks-mailchimp-api-key">
 
-			<p><?php _e( 'Enter your API key in the field below to connect your site to your MailChimp account.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+			<p><?php _e( 'Enter your API key in the field below to connect your site to your MailChimp account.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
-			<p><strong><?php _e( 'MailChimp API Key' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
+			<p><strong><?php _e( 'MailChimp API Key', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
 
-			<input autocomplete="off" <?php if ( $yikes_mc_api_constant ) { echo 'readonly="readonly"'; } if( strlen( yikes_get_mc_api_key() ) > 0 ) { ?> type="password" <?php } else { ?> type="text" <?php } ?> value="<?php echo yikes_get_mc_api_key(); ?>" placeholder="<?php _e( 'MailChimp API Key' , 'yikes-inc-easy-mailchimp-extender' ); ?>" name="yikes-mc-api-key" id="yikes-mc-api-key" class="settings-page-input" />
+			<input autocomplete="off" <?php if ( $yikes_mc_api_constant ) { echo 'readonly="readonly"'; } if ( strlen( yikes_get_mc_api_key() ) > 0 ) { ?> type="password" <?php } else { ?> type="text" <?php } ?> value="<?php echo yikes_get_mc_api_key(); ?>" placeholder="<?php _e( 'MailChimp API Key', 'yikes-inc-easy-mailchimp-extender' ); ?>" name="yikes-mc-api-key" id="yikes-mc-api-key" class="settings-page-input" />
 
 			<?php if ( $yikes_mc_api_constant ) { ?>
 				<p class="description"><?php printf( __( "Your MailChimp API key has been defined using the %s constant, in a PHP file.", "yikes-inc-easy-mailchimp-extender" ), '<code>YIKES_MC_API_KEY</code>' ); ?></p>
@@ -34,7 +34,7 @@ 
 			<?php echo $api_error_response; ?>
 
 			<?php if ( ! $yikes_mc_api_constant ) { ?>
-				<p class="description"><small><a href="https://admin.mailchimp.com/account/api" target="_blank" title="<?php _e( 'Get your API key here' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Get your API key here' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p>
+				<p class="description"><small><a href="https://admin.mailchimp.com/account/api" target="_blank" title="<?php _e( 'Get your API key here', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Get your API key here', 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p>
 			<?php } ?>
 		</label>
 

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

Spacing +51 added lines, -51 removed lines

@@ -11,8 +11,8 @@ 
 */
 
 	// enqueue jquery qtip for our tooltip
-	wp_enqueue_script( 'jquery-qtip-tooltip', YIKES_MC_URL . 'admin/js/min/jquery.qtip.min.js' , array( 'jquery' ) );
-	wp_enqueue_style( 'jquery-qtip-style',  YIKES_MC_URL . 'admin/css/jquery.qtip.min.css' );
+	wp_enqueue_script( 'jquery-qtip-tooltip', YIKES_MC_URL . 'admin/js/min/jquery.qtip.min.js', array( 'jquery' ) );
+	wp_enqueue_style( 'jquery-qtip-style', YIKES_MC_URL . 'admin/css/jquery.qtip.min.css' );
 
 	?>
 	<script>
@@ -43,50 +43,50 @@ 
 	);
 
 	$class_descriptions = array(
-		'comment_form' => '<img class="tooltip-integration-banner" src="' . YIKES_MC_URL . 'includes/images/Checkbox_Integration_Logos/wordpress-banner-logo.png" title="' . __( 'WordPress' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Enabling the WordPress core comment form opt-in checkbox will display a checkbox to your current users when leaving a comment (if they are not currently subscribed).' , 'yikes-inc-easy-mailchimp-extender' ),
-		'registration_form' => '<img class="tooltip-integration-banner" src="' . YIKES_MC_URL . 'includes/images/Checkbox_Integration_Logos/wordpress-banner-logo.png" title="' . __( 'WordPress' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Enabling the WordPress core registration form opt-in checkbox will display a checkbox to new users when registering for your site.' , 'yikes-inc-easy-mailchimp-extender' ),
-		'woocommerce_checkout_form' => '<img class="tooltip-integration-banner" src="' . YIKES_MC_URL . 'includes/images/Checkbox_Integration_Logos/woocommerce-banner.png" title="' . __( 'WooCommerce Store' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Enabling the WooCommerce checkout opt-in form allows you to capture email addresses from users who make purchases in your store. This option will add an opt-in checkbox to the checkout page.' , 'yikes-inc-easy-mailchimp-extender' ),
-		'easy_digital_downloads_checkout_form' => '<img class="tooltip-integration-banner" src="' . YIKES_MC_URL . 'includes/images/Checkbox_Integration_Logos/edd-banner.png" title="' . __( 'Easy Digital Downloads' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Enabling the Easy Digital Downloads checkout opt-in allows users who make a purchase to opt-in to your mailing list during checkout.' , 'yikes-inc-easy-mailchimp-extender' ),
-		'buddypress_form' => '<img class="tooltip-integration-banner" src="' . YIKES_MC_URL . 'includes/images/Checkbox_Integration_Logos/buddypress-banner.png" title="' . __( 'BuddyPress' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Enabling the BuddyPress opt-in allows users who register for your site to be automatically added to the mailing list of your choice.' , 'yikes-inc-easy-mailchimp-extender' ),
-		'bbpress_forms' => '<img class="tooltip-integration-banner" src="' . YIKES_MC_URL . 'includes/images/Checkbox_Integration_Logos/bbpress-banner.png" title="' . __( 'bbPress' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Enabling the bbPress opt-in enables users who register to use the forums on your site to be automatically added to the mailing list of your choice.' , 'yikes-inc-easy-mailchimp-extender' ),
-		'contact_form_7' => '<img class="tooltip-integration-banner" src="' . YIKES_MC_URL . 'includes/images/Checkbox_Integration_Logos/cf7-banner.png" title="' . __( 'Contact Form 7' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Once the Contact Form 7 integration is active you can use our custom shortcode [yikes_mailchimp_checkbox] in your contact forms to subscribe users to a pre-selected list.' , 'yikes-inc-easy-mailchimp-extender' ),
+		'comment_form' => '<img class="tooltip-integration-banner" src="' . YIKES_MC_URL . 'includes/images/Checkbox_Integration_Logos/wordpress-banner-logo.png" title="' . __( 'WordPress', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Enabling the WordPress core comment form opt-in checkbox will display a checkbox to your current users when leaving a comment (if they are not currently subscribed).', 'yikes-inc-easy-mailchimp-extender' ),
+		'registration_form' => '<img class="tooltip-integration-banner" src="' . YIKES_MC_URL . 'includes/images/Checkbox_Integration_Logos/wordpress-banner-logo.png" title="' . __( 'WordPress', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Enabling the WordPress core registration form opt-in checkbox will display a checkbox to new users when registering for your site.', 'yikes-inc-easy-mailchimp-extender' ),
+		'woocommerce_checkout_form' => '<img class="tooltip-integration-banner" src="' . YIKES_MC_URL . 'includes/images/Checkbox_Integration_Logos/woocommerce-banner.png" title="' . __( 'WooCommerce Store', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Enabling the WooCommerce checkout opt-in form allows you to capture email addresses from users who make purchases in your store. This option will add an opt-in checkbox to the checkout page.', 'yikes-inc-easy-mailchimp-extender' ),
+		'easy_digital_downloads_checkout_form' => '<img class="tooltip-integration-banner" src="' . YIKES_MC_URL . 'includes/images/Checkbox_Integration_Logos/edd-banner.png" title="' . __( 'Easy Digital Downloads', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Enabling the Easy Digital Downloads checkout opt-in allows users who make a purchase to opt-in to your mailing list during checkout.', 'yikes-inc-easy-mailchimp-extender' ),
+		'buddypress_form' => '<img class="tooltip-integration-banner" src="' . YIKES_MC_URL . 'includes/images/Checkbox_Integration_Logos/buddypress-banner.png" title="' . __( 'BuddyPress', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Enabling the BuddyPress opt-in allows users who register for your site to be automatically added to the mailing list of your choice.', 'yikes-inc-easy-mailchimp-extender' ),
+		'bbpress_forms' => '<img class="tooltip-integration-banner" src="' . YIKES_MC_URL . 'includes/images/Checkbox_Integration_Logos/bbpress-banner.png" title="' . __( 'bbPress', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Enabling the bbPress opt-in enables users who register to use the forums on your site to be automatically added to the mailing list of your choice.', 'yikes-inc-easy-mailchimp-extender' ),
+		'contact_form_7' => '<img class="tooltip-integration-banner" src="' . YIKES_MC_URL . 'includes/images/Checkbox_Integration_Logos/cf7-banner.png" title="' . __( 'Contact Form 7', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Once the Contact Form 7 integration is active you can use our custom shortcode [yikes_mailchimp_checkbox] in your contact forms to subscribe users to a pre-selected list.', 'yikes-inc-easy-mailchimp-extender' ),
 	);
 
 	// Easy Digital Downloads
-	if( class_exists( 'Easy_Digital_Downloads' ) ) {
-		$active_plugins['easy_digital_downloads_checkout_form'] = __( 'Easy Digital Downloads Checkout', 'yikes-inc-easy-mailchimp-extender' );
+	if ( class_exists( 'Easy_Digital_Downloads' ) ) {
+		$active_plugins[ 'easy_digital_downloads_checkout_form' ] = __( 'Easy Digital Downloads Checkout', 'yikes-inc-easy-mailchimp-extender' );
 	}
 	// WooCommerce
-	if( class_exists( 'WooCommerce' ) ) {
-		$active_plugins['woocommerce_checkout_form'] = __( 'WooCommerce Checkout', 'yikes-inc-easy-mailchimp-extender' );
+	if ( class_exists( 'WooCommerce' ) ) {
+		$active_plugins[ 'woocommerce_checkout_form' ] = __( 'WooCommerce Checkout', 'yikes-inc-easy-mailchimp-extender' );
 	}
 	// BuddyPress
-	if( class_exists( 'BuddyPress' ) ) {
-		$active_plugins['buddypress_form'] = __( 'BuddyPress Registration', 'yikes-inc-easy-mailchimp-extender' );
+	if ( class_exists( 'BuddyPress' ) ) {
+		$active_plugins[ 'buddypress_form' ] = __( 'BuddyPress Registration', 'yikes-inc-easy-mailchimp-extender' );
 	}
 	// bbPress
-	if( class_exists( 'bbPress' ) ) {
-		$active_plugins['bbpress_forms'] = __( 'bbPress', 'yikes-inc-easy-mailchimp-extender' );
+	if ( class_exists( 'bbPress' ) ) {
+		$active_plugins[ 'bbpress_forms' ] = __( 'bbPress', 'yikes-inc-easy-mailchimp-extender' );
 	}
 	// Contact Form 7
-	if( is_plugin_active( 'contact-form-7/wp-contact-form-7.php' ) ) {
-		$active_plugins['contact_form_7'] = __( 'Contact Form 7', 'yikes-inc-easy-mailchimp-extender' );
+	if ( is_plugin_active( 'contact-form-7/wp-contact-form-7.php' ) ) {
+		$active_plugins[ 'contact_form_7' ] = __( 'Contact Form 7', 'yikes-inc-easy-mailchimp-extender' );
 	}
 
 	// store our checkbox options
-	$options = get_option( 'optin-checkbox-init' , '' );
+	$options = get_option( 'optin-checkbox-init', '' );
 ?>
-<h3><span><?php _e( 'Integration Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
+<h3><span><?php _e( 'Integration Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
 
 
 	<?php
 		// lets confirm the user has a valid API key stored
-		if( $this->is_user_mc_api_valid_form( false ) == 'valid' ) {
+		if ( $this->is_user_mc_api_valid_form( false ) == 'valid' ) {
 			/// Check for a transient, if not - set one up for one hour
 			if ( false === ( $list_data = get_transient( 'yikes-easy-mailchimp-list-data' ) ) ) {
 				$api_key = yikes_get_mc_api_key();
 				$dash_position = strpos( $api_key, '-' );
-				if( $dash_position !== false ) {
+				if ( $dash_position !== false ) {
 					$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/list.json';
 				}
 				$list_data = wp_remote_post( $api_endpoint, array(
@@ -98,11 +98,11 @@ 
 					'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 				) );
 				$list_data = json_decode( wp_remote_retrieve_body( $list_data ), true );
-				if( isset( $list_data['error'] ) ) {
-					if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+				if ( isset( $list_data[ 'error' ] ) ) {
+					if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 						require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 						$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-						$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data['error'], __( "Get Account Lists" , 'yikes-inc-easy-mailchimp-extender' ), "Integration Settings Page" );
+						$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data[ 'error' ], __( "Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ), "Integration Settings Page" );
 					}
 				} else {
 					// set our transient
@@ -113,7 +113,7 @@ 
 			?>
 			<div class="inside">
 				<?php
-					echo sprintf( __( 'Please %s to setup your integrations.', 'yikes-inc-easy-mailchimp-extender' ), '<a href="' . esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=general-settings' ) ) . '" title="' . __( 'General Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'enter a valid MailChimp API key' , 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );
+					echo sprintf( __( 'Please %s to setup your integrations.', 'yikes-inc-easy-mailchimp-extender' ), '<a href="' . esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=general-settings' ) ) . '" title="' . __( 'General Settings', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'enter a valid MailChimp API key', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );
 				?>
 			</div>
 			<?php
@@ -124,7 +124,7 @@ 
 <div class="inside">
 
 	<p>
-		<?php _e( 'Select which plugins or features Easy Forms for MailChimp by Yikes Inc. should integrate with. Depending on which plugins or features you choose to integrate with, an opt-in checkbox will be generated. For example, the comment form checkbox will generate a checkbox below the standard WordPress comment form to add any new commenters to a pre-determined MailChimp mailing list.' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+		<?php _e( 'Select which plugins or features Easy Forms for MailChimp by Yikes Inc. should integrate with. Depending on which plugins or features you choose to integrate with, an opt-in checkbox will be generated. For example, the comment form checkbox will generate a checkbox below the standard WordPress comment form to add any new commenters to a pre-determined MailChimp mailing list.', 'yikes-inc-easy-mailchimp-extender' ); ?>
 	</p>
 
 	<!-- Settings Form -->
@@ -134,54 +134,54 @@ 
 
 	<ul>
 		<?php
-			if( !empty( $active_plugins ) ) {
+			if ( ! empty( $active_plugins ) ) {
 
-				foreach( $active_plugins as $class => $value ) {
+				foreach ( $active_plugins as $class => $value ) {
 					// echo  $class;
-					$checked = isset( $options[$class]['value'] ) ? 'checked="checked"' : '';
-					$hidden =  !isset( $options[$class]['value'] ) ? 'yikes-easy-mc-hidden' : '';
-					$checkbox_label = isset( $options[$class]['label'] ) ? esc_attr__( $options[$class]['label'] ) : '';
-					$precheck_checkbox = isset( $options[$class]['precheck'] ) ? $options[$class]['precheck'] : '';
-					$selected_list = isset( $options[$class]['associated-list'] ) ? $options[$class]['associated-list'] : '-';
-					$list_interest_groups = isset( $options[$class]['interest-groups'] ) ? $options[$class]['interest-groups'] : false;
+					$checked = isset( $options[ $class ][ 'value' ] ) ? 'checked="checked"' : '';
+					$hidden = ! isset( $options[ $class ][ 'value' ] ) ? 'yikes-easy-mc-hidden' : '';
+					$checkbox_label = isset( $options[ $class ][ 'label' ] ) ? esc_attr__( $options[ $class ][ 'label' ] ) : '';
+					$precheck_checkbox = isset( $options[ $class ][ 'precheck' ] ) ? $options[ $class ][ 'precheck' ] : '';
+					$selected_list = isset( $options[ $class ][ 'associated-list' ] ) ? $options[ $class ][ 'associated-list' ] : '-';
+					$list_interest_groups = isset( $options[ $class ][ 'interest-groups' ] ) ? $options[ $class ][ 'interest-groups' ] : false;
 					?>
 						<li>
 							<label>
-								<input type="checkbox" name="optin-checkbox-init[<?php echo $class; ?>][value]" value="on" <?php echo $checked; ?> onclick="jQuery(this).parents('li').next().stop().slideToggle();"><?php echo ucwords( $value ); ?><span class="dashicons dashicons-editor-help"></span><div class="tooltiptext qtip-bootstrap" style="display:none;"><?php echo $class_descriptions[$class]; ?></div>
+								<input type="checkbox" name="optin-checkbox-init[<?php echo $class; ?>][value]" value="on" <?php echo $checked; ?> onclick="jQuery(this).parents('li').next().stop().slideToggle();"><?php echo ucwords( $value ); ?><span class="dashicons dashicons-editor-help"></span><div class="tooltiptext qtip-bootstrap" style="display:none;"><?php echo $class_descriptions[ $class ]; ?></div>
 							</label>
 						</li>
 						<!-- checkbox settings, text - associated list etc. -->
 						<li class="optin-checkbox-init[<?php echo $class; ?>]-settings <?php echo $hidden; ?>">
-							<?php if( $class == 'contact_form_7' ) { ?>
+							<?php if ( $class == 'contact_form_7' ) { ?>
 								<p style="margin-top:0;"><small class="contact-form-7-notice"><?php printf( __( 'Use %s in Contact Form 7 to display the checkbox.', 'yikes-inc-easy-mailchimp-extender' ), '<code>[yikes_mailchimp_checkbox]</code>' ); ?></small></p>
 							<?php } ?>
 							<p style="margin-top:0;padding-top:0;margin-bottom:0;padding-bottom:0;">
 								<!-- checkbox associated list -->
-								<label><?php _e( 'Associated List' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<label><?php _e( 'Associated List', 'yikes-inc-easy-mailchimp-extender' ); ?>
 									<?php
-										if( $list_data['total'] > 0 ) {
+										if ( $list_data[ 'total' ] > 0 ) {
 											?>
 												<select class="optin-checkbox-init[<?php echo $class; ?>][associated-list] checkbox-settings-list-dropdown" data-attr-integration="<?php echo $class; ?>" name="optin-checkbox-init[<?php echo $class; ?>][associated-list]" onchange="checkForInterestGroups( jQuery( this ), jQuery( this ).find( 'option:selected' ).val(), jQuery( this ).attr( 'data-attr-integration' ) );return false;">
-														<option value="-" <?php selected( $selected_list , '-' ); ?>><?php _e( 'Select a List' , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
-													<?php foreach( $list_data['data'] as $list ) { ?>
-														<option value="<?php echo $list['id']; ?>" <?php selected( $selected_list , $list['id'] ); ?>><?php echo $list['name']; ?></option>
+														<option value="-" <?php selected( $selected_list, '-' ); ?>><?php _e( 'Select a List', 'yikes-inc-easy-mailchimp-extender' ); ?></option>
+													<?php foreach ( $list_data[ 'data' ] as $list ) { ?>
+														<option value="<?php echo $list[ 'id' ]; ?>" <?php selected( $selected_list, $list[ 'id' ] ); ?>><?php echo $list[ 'name' ]; ?></option>
 													<?php } ?>
 												</select>
 											<?php
 										} else {
-											echo '<p class="description no-lists-setup-notice"><strong>' . __( 'You have not setup any lists. You should head over to MailChimp and setup your first list.' , 'yikes-inc-easy-mailchimp-extender' ) . '</strong></p>';
+											echo '<p class="description no-lists-setup-notice"><strong>' . __( 'You have not setup any lists. You should head over to MailChimp and setup your first list.', 'yikes-inc-easy-mailchimp-extender' ) . '</strong></p>';
 										}
 									?>
 								</label>
 								<!-- checkbox text label -->
-								<label><?php _e( 'Checkbox Label' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<label><?php _e( 'Checkbox Label', 'yikes-inc-easy-mailchimp-extender' ); ?>
 									<input type="text" class="optin-checkbox-init[<?php echo $class; ?>][label] optin-checkbox-label-input" name="optin-checkbox-init[<?php echo $class; ?>][label]" value="<?php echo $checkbox_label; ?>">
 								</label>
 								<!-- prechecked? -->
-								<label><?php _e( 'Precheck Checkbox' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<label><?php _e( 'Precheck Checkbox', 'yikes-inc-easy-mailchimp-extender' ); ?>
 									<select id="optin-checkbox-init[<?php echo $class; ?>][precheck]" name="optin-checkbox-init[<?php echo $class; ?>][precheck]" class="optin-checkbox-init[<?php echo $class; ?>][precheck] checkbox-settings-list-dropdown">
-										<option value="true" <?php selected( $precheck_checkbox , 'true' ); ?>><?php _e( 'Yes' , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
-										<option value="false" <?php selected( $precheck_checkbox , 'false' ); ?>><?php _e( 'No' , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
+										<option value="true" <?php selected( $precheck_checkbox, 'true' ); ?>><?php _e( 'Yes', 'yikes-inc-easy-mailchimp-extender' ); ?></option>
+										<option value="false" <?php selected( $precheck_checkbox, 'false' ); ?>><?php _e( 'No', 'yikes-inc-easy-mailchimp-extender' ); ?></option>
 									</select>
 								</label>
 
@@ -192,8 +192,8 @@ 
 											$interest_groupings = get_transient( $selected_list . '_interest_group' );
 											$integration_type = $class;
 											require( YIKES_MC_PATH . 'admin/partials/menu/options-sections/templates/integration-interest-groups.php' );
-										} else if( $selected_list != '-' && $list_interest_groups ) {
-											$list_id = $options[$class]['associated-list'];
+										} else if ( $selected_list != '-' && $list_interest_groups ) {
+											$list_id = $options[ $class ][ 'associated-list' ];
 											$integration_type = $class;
 											YIKES_Inc_Easy_MailChimp_Process_Ajax::check_list_for_interest_groups( $list_id, $integration_type, true );
 										}
@@ -208,7 +208,7 @@ 
 			} else {
 				?>
 					<li>
-						<?php _e( 'Nothing is active.' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+						<?php _e( 'Nothing is active.', 'yikes-inc-easy-mailchimp-extender' ); ?>
 					</li>
 				<?php
 			}

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

Spacing +17 added lines, -17 removed lines

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

public/partials/shortcodes/process_form_shortcode_depracated.php

Spacing +1 added lines, -1 removed lines

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

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

Spacing +18 added lines, -18 removed lines

@@ -12,23 +12,23 @@ 
 		array(
 			'form' => '', // pass in a form, which will retreive the associated list ID -- takes precendence
 			'list' => '', // pass in a specific list ID
-		), $attributes , 'yikes-mailchimp-subscriber-count' )
+		), $attributes, 'yikes-mailchimp-subscriber-count' )
 	);
 
 	/* If the user hasn't authenticated yet - bail */
-	if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) != 'valid_api_key' ) {
-		if( WP_DEBUG ) {
+	if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'valid_api_key' ) {
+		if ( WP_DEBUG ) {
 			return '<strong>' . __( "You don't appear to be connected to MailChimp.", "yikes-inc-easy-mailchimp-extender" ) . '</strong>';
 		}
 		return;
 	}
 
-	$form = ( ! empty( $attributes['form'] ) ) ? str_replace( '&quot;', '', $attributes['form'] ) : false; // replace the sanitize quotes to perform a proper query
-	$list_id = ( ! empty( $attributes['list'] ) ) ? $attributes['list'] : false;
+	$form = ( ! empty( $attributes[ 'form' ] ) ) ? str_replace( '&quot;', '', $attributes[ 'form' ] ) : false; // replace the sanitize quotes to perform a proper query
+	$list_id = ( ! empty( $attributes[ 'list' ] ) ) ? $attributes[ 'list' ] : false;
 
 	/* If no list ID was passed into the shortcode - bail */
-	if( ! $list_id  && ! $form) {
-		if( WP_DEBUG ) {
+	if ( ! $list_id && ! $form ) {
+		if ( WP_DEBUG ) {
 			return '<strong>' . __( 'You forgot to include the list or form ID.', 'yikes-inc-easy-mailchimp-extender' ) . '</strong>';
 		}
 		return;
@@ -40,14 +40,14 @@ 
 		$form_data = $interface->get_form( $form );
 
 		// confirm we have some results, or return an error
-		if( ! $form_data ) {
-			if( WP_DEBUG ) {
-				return __( "Oh no...This form doesn't exist. Head back to the manage forms page and select a different form." , 'yikes-inc-easy-mailchimp-extender' );
+		if ( ! $form_data ) {
+			if ( WP_DEBUG ) {
+				return __( "Oh no...This form doesn't exist. Head back to the manage forms page and select a different form.", 'yikes-inc-easy-mailchimp-extender' );
 			}
 			return;
 		}
 
-		$list_id = sanitize_key( $form_data['list_id'] ); // associated list id (users who fill out the form will be subscribed to this list)
+		$list_id = sanitize_key( $form_data[ 'list_id' ] ); // associated list id (users who fill out the form will be subscribed to this list)
 	}
 
 	// object buffer
@@ -59,7 +59,7 @@ 
 		// get the api key
 		$api_key = yikes_get_mc_api_key();
 		$dash_position = strpos( $api_key, '-' );
-		if( $dash_position !== false ) {
+		if ( $dash_position !== false ) {
 			$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/list.json';
 		}
 
@@ -76,23 +76,23 @@ 
 		) );
 
 		$subscriber_count_response = json_decode( wp_remote_retrieve_body( $subscriber_count_response ), true );
-		if( isset( $subscriber_count_response['error'] ) ) {
-			if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+		if ( isset( $subscriber_count_response[ 'error' ] ) ) {
+			if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 				require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-				$error_logging->yikes_easy_mailchimp_write_to_error_log( $subscriber_count_response['error'], __( "Get Account Lists" , 'yikes-inc-easy-mailchimp-extender' ), "yikes-mailchimp-subscriber-count.php" );
+				$error_logging->yikes_easy_mailchimp_write_to_error_log( $subscriber_count_response[ 'error' ], __( "Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ), "yikes-mailchimp-subscriber-count.php" );
 			}
 		}
 		// if more than one list is returned, something went wrong - bail
-		if( $subscriber_count_response['total'] != 1 ) {
-			if( WP_DEBUG ) {
+		if ( $subscriber_count_response[ 'total' ] != 1 ) {
+			if ( WP_DEBUG ) {
 				return '<strong>' . sprintf( __( "It looks like this list wasn't found. Double check the list with with ID '%s' exists.", "yikes-inc-easy-mailchimp-extender" ), $list_id ) . '</strong>';
 			}
 			return;
 		}
 
 		/* type cast the returned value as an integer */
-		echo (int) apply_filters( 'yikes-mailchimp-subscriber-count-value', $subscriber_count_response['data'][0]['stats']['member_count'] );
+		echo (int) apply_filters( 'yikes-mailchimp-subscriber-count-value', $subscriber_count_response[ 'data' ][ 0 ][ 'stats' ][ 'member_count' ] );
 
 	} catch ( Exception $error ) {
 		echo $error->getMessage();

public/partials/ajax/class.public_ajax.php

Spacing +39 added lines, -39 removed lines

@@ -11,16 +11,16 @@ 
 	 */
 	public function __construct() {
 		// ajax process form submission
-		add_action( 'wp_ajax_nopriv_process_form_submission', array( $this , 'process_form_submission' ), 10 );
-		add_action( 'wp_ajax_process_form_submission', array( $this , 'process_form_submission' ), 10 );
+		add_action( 'wp_ajax_nopriv_process_form_submission', array( $this, 'process_form_submission' ), 10 );
+		add_action( 'wp_ajax_process_form_submission', array( $this, 'process_form_submission' ), 10 );
 
 		// ajax send update emails
-		add_action( 'wp_ajax_nopriv_easy_forms_send_email', array( $this , 'sendUpdateProfileEmail' ), 10 );
-		add_action( 'wp_ajax_easy_forms_send_email', array( $this , 'sendUpdateProfileEmail' ), 10 );
+		add_action( 'wp_ajax_nopriv_easy_forms_send_email', array( $this, 'sendUpdateProfileEmail' ), 10 );
+		add_action( 'wp_ajax_easy_forms_send_email', array( $this, 'sendUpdateProfileEmail' ), 10 );
 
 		// increase submission count for a given form on successful submit
-		add_action( 'wp_ajax_nopriv_increase_submission_count' , array( $this , 'increase_submission_count' ), 10 );
-		add_action( 'wp_ajax_increase_submission_count' , array( $this , 'increase_submission_count' ), 10 );
+		add_action( 'wp_ajax_nopriv_increase_submission_count', array( $this, 'increase_submission_count' ), 10 );
+		add_action( 'wp_ajax_increase_submission_count', array( $this, 'increase_submission_count' ), 10 );
 	}
 
 	/*
@@ -37,7 +37,7 @@ 
 	 * Increase the submission count for a given form.
 	 */
 	public function increase_submission_count() {
-		$form_id   = intval( $_POST['form_id'] );
+		$form_id   = intval( $_POST[ 'form_id' ] );
 		$interface = yikes_easy_mailchimp_extender_get_form_interface();
 		$form      = $interface->get_form( $form_id );
 
@@ -47,7 +47,7 @@ 
 		}
 
 		// Update the form.
-		$submission_count = isset( $form['submissions'] ) ? $form['submissions'] + 1 : 1;
+		$submission_count = isset( $form[ 'submissions' ] ) ? $form[ 'submissions' ] + 1 : 1;
 		$interface->update_form_field( $form_id, 'submissions', $submission_count );
 
 		exit();
@@ -58,17 +58,17 @@ 
 		@since v6.0.4.1
 	*/
 	public function sendUpdateProfileEmail() {
-		$user_email = $_POST['user_email'];
-		$list_id = $_POST['list_id'];
+		$user_email = $_POST[ 'user_email' ];
+		$list_id = $_POST[ 'list_id' ];
 
 		$api_key = yikes_get_mc_api_key();
 		$dash_position = strpos( $api_key, '-' );
-		$explode_key = explode( '-' , $api_key );
-		$data_center = $explode_key[1];
-		$full_site_url = get_bloginfo('url');
+		$explode_key = explode( '-', $api_key );
+		$data_center = $explode_key[ 1 ];
+		$full_site_url = get_bloginfo( 'url' );
 
 		// list details api call
-		if( $dash_position !== false ) {
+		if ( $dash_position !== false ) {
 			$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/list.json';
 		}
 		$list_details = wp_remote_post( $api_endpoint, array(
@@ -82,16 +82,16 @@ 
 			'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 		) );
 		$list_details = json_decode( wp_remote_retrieve_body( $list_details ), true );
-		if( isset( $list_details['error'] ) ) {
-			if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+		if ( isset( $list_details[ 'error' ] ) ) {
+			if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 				require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-				$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_details['error'], __( "Send Update Profile Email - Get Account Lists" , 'yikes-inc-easy-mailchimp-extender' ), "class.public_ajax.php" );
+				$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_details[ 'error' ], __( "Send Update Profile Email - Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ), "class.public_ajax.php" );
 			}
 		}
 
 		// account details api call
-		if( $dash_position !== false ) {
+		if ( $dash_position !== false ) {
 			$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/helper/account-details.json';
 		}
 		$account_details = wp_remote_post( $api_endpoint, array(
@@ -102,16 +102,16 @@ 
 			'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 		) );
 		$account_details = json_decode( wp_remote_retrieve_body( $account_details ), true );
-		if( isset( $account_details['error'] ) ) {
-			if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+		if ( isset( $account_details[ 'error' ] ) ) {
+			if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 				require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-				$error_logging->yikes_easy_mailchimp_write_to_error_log( $account_details['error'], __( "Send Update Profile Email - Get Account Details" , 'yikes-inc-easy-mailchimp-extender' ), "class.public_ajax.php" );
+				$error_logging->yikes_easy_mailchimp_write_to_error_log( $account_details[ 'error' ], __( "Send Update Profile Email - Get Account Details", 'yikes-inc-easy-mailchimp-extender' ), "class.public_ajax.php" );
 			}
 		}
 
 		// subscriber details api call
-		if( $dash_position !== false ) {
+		if ( $dash_position !== false ) {
 			$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/member-info.json';
 		}
 		$subscriber_account_details = wp_remote_post( $api_endpoint, array(
@@ -126,27 +126,27 @@ 
 			'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 		) );
 		$subscriber_account_details = json_decode( wp_remote_retrieve_body( $subscriber_account_details ), true );
-		if( isset( $subscriber_account_details['error'] ) ) {
-			if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+		if ( isset( $subscriber_account_details[ 'error' ] ) ) {
+			if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 				require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-				$error_logging->yikes_easy_mailchimp_write_to_error_log( $subscriber_account_details['error'], __( "Send Update Profile Email - Get Member Info." , 'yikes-inc-easy-mailchimp-extender' ), "class.public_ajax.php" );
+				$error_logging->yikes_easy_mailchimp_write_to_error_log( $subscriber_account_details[ 'error' ], __( "Send Update Profile Email - Get Member Info.", 'yikes-inc-easy-mailchimp-extender' ), "class.public_ajax.php" );
 			}
 		}
 
 		// check for errors in any of the calls
-		if( isset( $list_details['error'] ) || isset( $account_details['error'] ) || isset( $subscriber_account_details['error'] ) ) {
-			$error_message = ( isset( $list_details['error'] ) ) ? $list_details['error'] : false;
-			if( ! $error_message ) {
-				$error_message = ( isset( $account_details['error'] ) ) ? $account_details['error'] : false;
-				if( ! $error_message ) {
-					$error_message = ( isset( $subscriber_account_details['error'] ) ) ? $subscriber_account_details['error'] : false;
-					if( ! $error_message ) {
+		if ( isset( $list_details[ 'error' ] ) || isset( $account_details[ 'error' ] ) || isset( $subscriber_account_details[ 'error' ] ) ) {
+			$error_message = ( isset( $list_details[ 'error' ] ) ) ? $list_details[ 'error' ] : false;
+			if ( ! $error_message ) {
+				$error_message = ( isset( $account_details[ 'error' ] ) ) ? $account_details[ 'error' ] : false;
+				if ( ! $error_message ) {
+					$error_message = ( isset( $subscriber_account_details[ 'error' ] ) ) ? $subscriber_account_details[ 'error' ] : false;
+					if ( ! $error_message ) {
 						$error_message = '';
 					}
 				}
 			}
-			$errorMessage = sprintf( __( 'Error sending update profile email. <strong>Error: %s</strong>. Please contact the site administrator.' , 'yikes-inc-easy-mailchimp-extender' ), $error_message );
+			$errorMessage = sprintf( __( 'Error sending update profile email. <strong>Error: %s</strong>. Please contact the site administrator.', 'yikes-inc-easy-mailchimp-extender' ), $error_message );
 			wp_send_json_error(
 				array(
 					'response_text' => '<div class="yikes-easy-mc-error-message">&#10005; ' . $errorMessage . '</div>',
@@ -156,11 +156,11 @@ 
 		}
 
 		// send the email!
-		$subscriber_id = $subscriber_account_details['data'][0]['id'];
-		$explode_url = explode( '.' , $account_details['contact']['url'] );
-		$update_link_href = 'http://' . $explode_url[1] . '.' . $data_center . '.list-manage1.com/profile?u=' . $account_details['user_id'] . '&id=' . $list_id .'&e=' . $subscriber_id;
+		$subscriber_id = $subscriber_account_details[ 'data' ][ 0 ][ 'id' ];
+		$explode_url = explode( '.', $account_details[ 'contact' ][ 'url' ] );
+		$update_link_href = 'http://' . $explode_url[ 1 ] . '.' . $data_center . '.list-manage1.com/profile?u=' . $account_details[ 'user_id' ] . '&id=' . $list_id . '&e=' . $subscriber_id;
 		$subject = 'MailChimp Profile Update';
-		$headers = 'From: ' . $list_details['data'][0]['default_from_name'] . ' <' . $list_details['data'][0]['default_from_email'] . '>' . "\r\n";
+		$headers = 'From: ' . $list_details[ 'data' ][ 0 ][ 'default_from_name' ] . ' <' . $list_details[ 'data' ][ 0 ][ 'default_from_email' ] . '>' . "\r\n";
 		$headers .= 'Content-type: text/html';
 			$email_content = '<p>Greetings,</p> <p>A request has been made to update your MailChimp account profile information. To do so please use the following link: <a href="' . $update_link_href . '" title="Update MailChimp Profile">Update MailChimp Profile Info.</a>';
 			$email_content .= "<p>If you did not request this update, please disregard this email.</p>";
@@ -173,14 +173,14 @@ 
 		if ( wp_mail( $user_email, apply_filters( 'yikes-mailchimp-update-email-subject', $subject ), apply_filters( 'yikes-mailchimp-update-email-content', $email_content, $update_link_href ), $headers ) ) {
 			wp_send_json_success(
 				array(
-					'response_text' => '<div class="yikes-easy-mc-success-message">' . sprintf( __( '%s Update email successfully sent. Please check your inbox for the message.' , 'yikes-inc-easy-mailchimp-extender' ), '&#10004;' ) . '</div>',
+					'response_text' => '<div class="yikes-easy-mc-success-message">' . sprintf( __( '%s Update email successfully sent. Please check your inbox for the message.', 'yikes-inc-easy-mailchimp-extender' ), '&#10004;' ) . '</div>',
 				)
 			);
 			exit;
 		} else {
 			wp_send_json_error(
 				array(
-					'response_text' => '<div class="yikes-easy-mc-error-message">' . sprintf( __( '%s Email failed to send. Please contact the site administrator.' , 'yikes-inc-easy-mailchimp-extender' ), '&#10005;' ) . '</div>',
+					'response_text' => '<div class="yikes-easy-mc-error-message">' . sprintf( __( '%s Email failed to send. Please contact the site administrator.', 'yikes-inc-easy-mailchimp-extender' ), '&#10005;' ) . '</div>',
 				)
 			);
 			exit;

includes/third-party-integrations/visual-composer/visual-composer.php

Spacing +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
 		if ( ! empty( $all_forms ) ) {
 			// build an array to pass to our javascript
 			foreach ( $all_forms as $id => $form ) {
-				$lists[ $form['form_name'] ] = $id;
+				$lists[ $form[ 'form_name' ] ] = $id;
 			}
 		} else {
 			$lists[ __( 'Please Import Some MailChimp Lists', 'yikes-inc-easy-mailchimp-extender' ) ] = '-';

includes/import-export/yikes-easy-mailchimp-import.class.php

Spacing +20 added lines, -20 removed lines

@@ -9,14 +9,14 @@ 
 	*	@table_name - table name to impot data to
 	*/	
 	public static function yikes_mailchimp_import_forms( $csv_file ) {
-		if ( ! isset( $_REQUEST['action'] ) ||  $_REQUEST['action'] !== 'yikes-easy-mc-import-forms' ) {
+		if ( ! isset( $_REQUEST[ 'action' ] ) || $_REQUEST[ 'action' ] !== 'yikes-easy-mc-import-forms' ) {
 			wp_die( __( 'There was an error during import. If you continue to run into issues, please reach out to the Yikes Inc. support team.', 'yikes-inc-easy-mailchimp-extender' ) );
 		}
 
-		$name      = $csv_file['csv']['name'];
+		$name      = $csv_file[ 'csv' ][ 'name' ];
 		$ext_array = explode( '.', $name );
 		$ext       = end( $ext_array );
-		$tmp_name  = $csv_file['csv']['tmp_name'];
+		$tmp_name  = $csv_file[ 'csv' ][ 'tmp_name' ];
 
 		// Ensure we have a valid file extension.
 		if ( 'csv' !== $ext ) {
@@ -41,17 +41,17 @@ 
 
 			// Check if this is a settings import by confirming the first option is 'yikes-mc-api-key'
 			// @todo: this should be a separate method.
-			if( $line[0] == 'yikes-mc-api-key' ) {
-				$options = fgetcsv($file, 10000, ',');
+			if ( $line[ 0 ] == 'yikes-mc-api-key' ) {
+				$options = fgetcsv( $file, 10000, ',' );
 				$new_settings = array();
 				$x = 0;
 				// build our new array $key => $value pair
-				foreach( $line as $option_name ) {
-					$new_settings[$option_name] = $options[$x];
+				foreach ( $line as $option_name ) {
+					$new_settings[ $option_name ] = $options[ $x ];
 					$x++;
 				}
 				// update the options in the databse
-				foreach( $new_settings as $option_name => $option_value ) {
+				foreach ( $new_settings as $option_name => $option_value ) {
 					update_option( $option_name, $option_value );
 				}
 			} else { // if it's not, then it's an opt-in forms import
@@ -80,7 +80,7 @@ 
 			$row++;
 		}
 
-		fclose($file);
+		fclose( $file );
 	}
 	
 	/*
@@ -91,20 +91,20 @@ 
 	*/	
 	public static function yikes_mailchimp_import_type( $csv_file ) {
 		// confirm
-		if( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-import-forms' ) {
-			$name = $csv_file['csv']['name'];
-			$ext_array = explode('.', $name);
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-import-forms' ) {
+			$name = $csv_file[ 'csv' ][ 'name' ];
+			$ext_array = explode( '.', $name );
 			$ext = end( $ext_array );
-			$tmpName = $csv_file['csv']['tmp_name'];
-			if($ext === 'csv') {
-				if(($handle = fopen($tmpName, 'r')) !== FALSE) {
-					$num = count($handle);
-					$file = fopen( $tmpName, 'r');
+			$tmpName = $csv_file[ 'csv' ][ 'tmp_name' ];
+			if ( $ext === 'csv' ) {
+				if ( ( $handle = fopen( $tmpName, 'r' ) ) !== FALSE ) {
+					$num = count( $handle );
+					$file = fopen( $tmpName, 'r' );
 					$row = 1;
-					$first_line_data = fgetcsv($file, 10000, ',');
-					if( count( $first_line_data ) > 1 ) {
+					$first_line_data = fgetcsv( $file, 10000, ',' );
+					if ( count( $first_line_data ) > 1 ) {
 						// Check if this is a settings import by confirming the first option is 'yikes-mc-api-key'
-						if( $first_line_data[0] == 'yikes-mc-api-key' ) {
+						if ( $first_line_data[ 0 ] == 'yikes-mc-api-key' ) {
 							$import_type = 'import-settings';
 						} else {
 							$import_type = 'import-forms';

Braces +2 added lines, -1 removed lines

@@ -54,7 +54,8 @@
 				foreach( $new_settings as $option_name => $option_value ) {
 					update_option( $option_name, $option_value );
 				}
-			} else { // if it's not, then it's an opt-in forms import
+			} else {
+// if it's not, then it's an opt-in forms import
 				// If this is the first row, then it should be title data.
 				if ( 1 === $row ) {
 					$titles = $line;