yikesinc / yikes-inc-easy-mailchimp-extender

admin/partials/menu/lists.php

Spacing +24 added lines, -24 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 	// lets confirm the user has a valid API key stored
-	if( $this->is_user_mc_api_valid_form( false ) == 'valid' ) {
+	if ( $this->is_user_mc_api_valid_form( false ) == 'valid' ) {
 		/// Check for a transient, if not - set one up for one hour
 		if ( false === ( $list_data = get_transient( 'yikes-easy-mailchimp-list-data' ) ) ) {
-			$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
+			$api_key = trim( get_option( 'yikes-mc-api-key', '' ) );
 			$dash_position = strpos( $api_key, '-' );
-			if( $dash_position !== false ) {
+			if ( $dash_position !== false ) {
 				$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/list.json';
 			}
 			$list_data = wp_remote_post( $api_endpoint, array( 
@@ -17,11 +17,11 @@ 
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
 			$list_data = json_decode( wp_remote_retrieve_body( $list_data ), true );
-			if( isset( $list_data['error'] ) ) {	
-				if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+			if ( isset( $list_data[ 'error' ] ) ) {	
+				if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 					require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 					$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-					$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data['error'], __( "Get Account Lists" , 'yikes-inc-easy-mailchimp-extender' ), "View Lists Page" );
+					$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data[ 'error' ], __( "Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ), "View Lists Page" );
 				}
 			} else {		
 				// set our transient
@@ -29,7 +29,7 @@ 
 			}
 		}
 	} 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 );
 	}
 		
 	wp_register_script( 'yikes-easy-mc-manage-forms-script', YIKES_MC_URL . 'admin/js/yikes-inc-easy-mailchimp-manage-forms.js', array( 'jquery' ), $this->version, false );
@@ -43,12 +43,12 @@ 
 ?>
 <div class="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>YIKES Easy Forms for MailChimp | <?php _e( 'Manage Lists' , 'yikes-inc-easy-mailchimp-extender' ) ?></h1>				
+	<h1>YIKES Easy Forms for MailChimp | <?php _e( 'Manage Lists', 'yikes-inc-easy-mailchimp-extender' ) ?></h1>				
 		
 	<!-- Settings Page Description -->
-	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Make edits to your MailChimp lists on the following page. Select a list to make edits to it.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Make edits to your MailChimp lists on the following page. Select a list to make edits to it.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 		
 	<!-- entire body content -->
 		<div id="poststuff">
@@ -68,8 +68,8 @@ 
 									<thead>
 										<tr>
 											<th id="cb" class="manage-column column-cb check-column" scope="col"><input type="checkbox" /></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>
+											<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 -->
@@ -78,36 +78,36 @@ 
 									<tfoot>
 										<tr>
 											<th class="manage-column column-cb check-column" scope="col"><input type="checkbox" /></th>
-											<th class="manage-column column-columnname" scope="col"><?php _e( 'Form 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( 'Form 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['total'] ) > 0 ) { 
+										<?php if ( count( $list_data[ 'total' ] ) > 0 ) { 
 												$i = 1;
-												foreach( $list_data['data'] as $list ) { 
+												foreach ( $list_data[ 'data' ] as $list ) { 
 										?>
-											<tr class="<?php if( $i % 2 == 0 ) { echo 'alternate'; } ?>">
+											<tr class="<?php if ( $i % 2 == 0 ) { echo 'alternate'; } ?>">
 												<th class="check-column" scope="row"><input type="checkbox" /></th>
-												<td class="column-columnname"><?php echo stripslashes( $list['name'] ); ?>
+												<td class="column-columnname"><?php echo stripslashes( $list[ 'name' ] ); ?>
 													<div class="row-actions">
-														<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'list-id' => (int) $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' => (int) $list['id'] ) , admin_url( 'admin.php?page=yikes-mailchimp-edit-list' ) ) ); ?>"><?php _e( "Edit Fields" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
-														<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => '', 'mailchimp-list' => (int) $list['id'] , 'nonce' => wp_create_nonce( 'duplicate-mailchimp-form-'.$list['id'] ) ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>"><?php _e( "Delete" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
-														<span><a href="#" class="view-yikes-mc-list-info"><?php _e( "List Info." , 'yikes-inc-easy-mailchimp-extender' ); ?></a></span>														
+														<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'list-id' => (int) $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' => (int) $list[ 'id' ] ), admin_url( 'admin.php?page=yikes-mailchimp-edit-list' ) ) ); ?>"><?php _e( "Edit Fields", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
+														<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => '', 'mailchimp-list' => (int) $list[ 'id' ], 'nonce' => wp_create_nonce( 'duplicate-mailchimp-form-' . $list[ 'id' ] ) ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>"><?php _e( "Delete", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
+														<span><a href="#" class="view-yikes-mc-list-info"><?php _e( "List Info.", 'yikes-inc-easy-mailchimp-extender' ); ?></a></span>														
 													</div>
 												</td>
-												<td class="column-columnname num"><?php echo $list['stats']['member_count']; ?></td>
+												<td class="column-columnname num"><?php echo $list[ 'stats' ][ 'member_count' ]; ?></td>
 											</tr>
 										<?php 	
 												$i++;
 												}
 											} else { ?>
 											<tr class="no-items">
-												<td class="colspanchange no-mailchimp-lists-found" colspan="3"><em><?php _e( 'No MailChimp lists found. Head over to' , 'yikes-inc-easy-mailchimp-extender' ); ?></em></td>
+												<td class="colspanchange no-mailchimp-lists-found" colspan="3"><em><?php _e( 'No MailChimp lists found. Head over to', 'yikes-inc-easy-mailchimp-extender' ); ?></em></td>
 											</tr>
 										<?php } ?>
 									</tbody>

Braces +4 added lines, -4 removed lines

@@ -17,13 +17,13 @@ 
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
 			$list_data = json_decode( wp_remote_retrieve_body( $list_data ), true );
-			if( isset( $list_data['error'] ) ) {	
+			if( isset( $list_data['error'] ) ) {
 				if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
 					require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 					$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
 					$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data['error'], __( "Get Account Lists" , 'yikes-inc-easy-mailchimp-extender' ), "View Lists Page" );
 				}
-			} else {		
+			} else {
 				// set our transient
 				set_transient( 'yikes-easy-mailchimp-list-data', $list_data, 1 * HOUR_IN_SECONDS );
 			}
@@ -86,9 +86,9 @@ 
 									
 									<!-- TABLE BODY -->
 									<tbody>
-										<?php if( count( $list_data['total'] ) > 0 ) { 
+										<?php if( count( $list_data['total'] ) > 0 ) {
 												$i = 1;
-												foreach( $list_data['data'] as $list ) { 
+												foreach( $list_data['data'] as $list ) {
 										?>
 											<tr class="<?php if( $i % 2 == 0 ) { echo 'alternate'; } ?>">
 												<th class="check-column" scope="row"><input type="checkbox" /></th>

admin/partials/menu/add-ons.php

Spacing +8 added lines, -8 removed lines

@@ -8,12 +8,12 @@ 
 <div class="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>YIKES Easy Forms for MailChimp | <?php echo __( '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 _e( 'View All Add-Ons' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'View All Add-Ons' , 'yikes-inc-easy-mailchimp-extender' ); ?> <span class="dashicons dashicons-external"></span></a></h1>				
+	<h1>YIKES Easy Forms for MailChimp | <?php echo __( '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 _e( 'View All Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _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 _e( "Below you'll find a list of add-ons available for YIKES Easy Forms for MailChimp. Each add-on extends the base functionality of the free plugin." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+	<p class="yikes-easy-mc-about-text about-text"><?php _e( "Below you'll find a list of add-ons available for YIKES Easy Forms for MailChimp. Each add-on extends the base functionality of the free plugin.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 	
 	<!-- Add-On Container -->
 	<section id="add-ons">
@@ -48,21 +48,21 @@ 
 				return $feed = new WP_Error( 'simplepie-error', $feed->error() );
 			}
 			// print_r( $feed->get_items() );
-			foreach( $feed->get_items() as $add_on ) {
+			foreach ( $feed->get_items() as $add_on ) {
 				// store the description
 				$description_pre_split = $add_on->get_description();
 				$permalink = esc_url( $add_on->get_permalink() );
 				$add_on_title = $add_on->get_title();
 				// If the returned add-on is this base plugin, skip it
-				if( $add_on_title != 'Easy Forms for MailChimp' ) {
+				if ( $add_on_title != 'Easy Forms for MailChimp' ) {
 					// extract the image
 					preg_match( '/<img[^>]+\>/i', $description_pre_split, $split_string );
 					// store the content sans image tag
 					$description = preg_replace( "/<img[^>]+\>/i", "", $add_on->get_description() ); 
 					// store the image
-					$image = ( count( $split_string ) > 0 ) ? $split_string[0] : '';
+					$image = ( count( $split_string ) > 0 ) ? $split_string[ 0 ] : '';
 					// if {hidden} is found, exclude it
-					if( strpos( $description_pre_split, '{hidden}' ) ) {
+					if ( strpos( $description_pre_split, '{hidden}' ) ) {
 						continue;
 					}
 					?>
@@ -83,7 +83,7 @@ 
 
 						<div class="addon-footer-wrap give-clearfix">
 							<a href="<?php echo $permalink; ?>" title="<?php echo $add_on_title; ?>" class="button-secondary" target="_blank">
-								<?php _e( 'View Add-on' , 'yikes-inc-easy-mailchimp-extender' ); ?>	
+								<?php _e( 'View Add-on', 'yikes-inc-easy-mailchimp-extender' ); ?>	
 							<span class="dashicons dashicons-external"></span></a>
 						</div>
 

admin/partials/menu/options-sections/api-cache-settings.php

Spacing +5 added lines, -5 removed lines

@@ -3,18 +3,18 @@
 	-	Clear MailChimp transient data such as forms, form fields, list data, subscribers etc.
 		*	transient cache is stored for 60 minutes.
 -->
-<h3><span><?php _e( 'API Cache Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
+<h3><span><?php _e( 'API Cache Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
 <div class="inside">
 									
 	<!-- Settings Form -->
-	<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">							
+	<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">							
 									
-		<p><?php _e( "Delete all MailChimp data stored in your sites cache. Most data is stored in the cache for 1 hour." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<p><?php _e( "Delete all MailChimp data stored in your sites cache. Most data is stored in the cache for 1 hour.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 			<!-- check if any of our transients contain data -->							
 			<?php if ( false === get_transient( 'yikes-easy-mailchimp-list-data' ) && false === get_transient( 'yikes-easy-mailchimp-profile-data' ) && false === get_transient( 'yikes-easy-mailchimp-account-data' ) ) { ?>
-				<p><a href="#" class="button-secondary" disabled="disabled" title="<?php _e( 'No MailChimp data found in temporary cache storage.' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Clear MailChimp API Cache' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></p>
+				<p><a href="#" class="button-secondary" disabled="disabled" title="<?php _e( 'No MailChimp data found in temporary cache storage.', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Clear MailChimp API Cache', 'yikes-inc-easy-mailchimp-extender' ); ?></a></p>
 			<?php } else { ?>
-				<p><input type="submit" class="button-primary" value="<?php _e( 'Clear MailChimp API Cache' , 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
+				<p><input type="submit" class="button-primary" value="<?php _e( 'Clear MailChimp API Cache', 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
 			<?php } ?>
 									
 	</form>

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

Spacing +19 added lines, -19 removed lines

@@ -5,65 +5,65 @@
 	// return it as an array, so we can work with it to build our form below
 	$all_forms = $wpdb->get_results( 'SELECT id, form_name FROM ' . $wpdb->prefix . 'yikes_easy_mc_forms', ARRAY_A );
 ?>
-<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">							
+	<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><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 ) ) { ?>	
+			<?php if ( ! empty( $all_forms ) ) { ?>	
 				<!-- 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 $form ) { ?>
-						<li><label><input type="checkbox" name="export_forms[]" value="<?php echo (int) $form['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 $form ) { ?>
+						<li><label><input type="checkbox" name="export_forms[]" value="<?php echo (int) $form[ 'id' ]; ?>"><?php echo esc_html( $form[ 'form_name' ] ); ?></label></li>
 					<?php } ?>
 				</ul>
 			<?php } else { ?>
-				<p><em><?php _e( "It looks like you haven't created any forms yet." , "yikes-inc-easy-mailchimp-extender" ); ?></em></p>
+				<p><em><?php _e( "It looks like you haven't created any forms yet.", "yikes-inc-easy-mailchimp-extender" ); ?></em></p>
 			<?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">							
+	<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><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">							
+	<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><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>
 	

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

Spacing +52 added lines, -52 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 = trim( get_option( 'yikes-mc-api-key' , '' ) );
+				$api_key = trim( get_option( 'yikes-mc-api-key', '' ) );
 				$dash_position = strpos( $api_key, '-' );
-				if( $dash_position !== false ) {
+				if ( $dash_position !== false ) {
 					$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/list.json';
 				}
 				$list_data = wp_remote_post( $api_endpoint, array( 
@@ -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
 			}

Braces +2 added lines, -2 removed lines

@@ -98,7 +98,7 @@ 
 					'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 				) );
 				$list_data = json_decode( wp_remote_retrieve_body( $list_data ), true );
-				if( isset( $list_data['error'] ) ) {	
+				if( isset( $list_data['error'] ) ) {
 					if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
 						require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 						$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
@@ -134,7 +134,7 @@ 
 	
 	<ul>
 		<?php 
-			if( !empty( $active_plugins ) ) { 
+			if( !empty( $active_plugins ) ) {
 				
 				foreach( $active_plugins as $class => $value ) {
 					// echo  $class;

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

Spacing +5 added lines, -5 removed lines

@@ -2,7 +2,7 @@ 
 	General Settings Options Template
 	-- yea
 -->
-<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 -->
@@ -15,15 +15,15 @@ 
 		<!-- 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( strlen( trim( get_option( 'yikes-mc-api-key' , '' ) ) ) > 0 ) { ?> type="password" <?php } else { ?> type="text" <?php } ?> value="<?php echo trim( get_option( 'yikes-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 ( strlen( trim( get_option( 'yikes-mc-api-key', '' ) ) ) > 0 ) { ?> type="password" <?php } else { ?> type="text" <?php } ?> value="<?php echo trim( get_option( 'yikes-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 echo $api_error_response; ?>
 			
-			<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>
 		
 		</label>
 												

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

Spacing +5 added lines, -5 removed lines

@@ -4,7 +4,7 @@ 
 	- php version, wp version, plugin version and debug log
 -->
 
-<h3><span><?php _e( 'Debug Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
+<h3><span><?php _e( 'Debug Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
 
 <div class="inside">
 	
@@ -13,10 +13,10 @@ 
 	
 		<?php settings_fields( 'yikes_inc_easy_mc_debug_settings_page' ); ?>
 	
-		<label for="yikes-mailchimp-debug-status"><strong><?php _e( 'Enable Debugging' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-			<input type="checkbox" name="yikes-mailchimp-debug-status" id="yikes-mailchimp-debug-status" value="1" <?php checked( get_option( 'yikes-mailchimp-debug-status' , '' ) , '1' ); ?>>
+		<label for="yikes-mailchimp-debug-status"><strong><?php _e( 'Enable Debugging', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+			<input type="checkbox" name="yikes-mailchimp-debug-status" id="yikes-mailchimp-debug-status" value="1" <?php checked( get_option( 'yikes-mailchimp-debug-status', '' ), '1' ); ?>>
 		</label>
-		<p class="description"><?php _e( "If you encounter an issue with Easy Forms for MailChimp you can toggle on debugging to display advanced error messages and start logging errors." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<p class="description"><?php _e( "If you encounter an issue with Easy Forms for MailChimp you can toggle on debugging to display advanced error messages and start logging errors.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 		
 		<?php submit_button(); ?>
 									
@@ -35,7 +35,7 @@ 
 				)
 			);
 		?>
-		<h2><?php _e( "Debug Log" , 'yikes-inc-easy-mailchimp-extender' ); ?> &nbsp; <a href="<?php echo $url; ?>" class="button-secondary"><?php _e( 'Clear Log', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h2>
+		<h2><?php _e( "Debug Log", 'yikes-inc-easy-mailchimp-extender' ); ?> &nbsp; <a href="<?php echo $url; ?>" class="button-secondary"><?php _e( 'Clear Log', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h2>
 		
 		<table class="widefat" id="yikes-mailchimp-error-log">
 			<!-- table header -->

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

Spacing +11 added lines, -11 removed lines

@@ -12,16 +12,16 @@ 
 
 ?>
 
-<h3><span><?php _e( 'reCAPTCHA Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
+<h3><span><?php _e( 'reCAPTCHA Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
 
 <div class="inside">
 	
 	<p>
-		<?php _e( 'reCAPTCHA is a free CAPTCHA service, from Google, that helps protect your site against spam, malicious registrations and other forms of attacks where computers try to disguise themselves as a human. reCAPTCHA will help prevent spammers and bots from submitting data through your MailChimp forms.' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+		<?php _e( 'reCAPTCHA is a free CAPTCHA service, from Google, that helps protect your site against spam, malicious registrations and other forms of attacks where computers try to disguise themselves as a human. reCAPTCHA will help prevent spammers and bots from submitting data through your MailChimp forms.', 'yikes-inc-easy-mailchimp-extender' ); ?>
 	</p>
 	
 	<p>
-		<?php echo '<a href="https://www.google.com/recaptcha/admin" target="_blank" title="' . __( 'Get your reCAPTCHA API Key' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Get Your reCAPTCHA API Key' , 'yikes-inc-easy-mailchimp-extender' ) . '</a>'; ?>
+		<?php echo '<a href="https://www.google.com/recaptcha/admin" target="_blank" title="' . __( 'Get your reCAPTCHA API Key', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Get Your reCAPTCHA API Key', 'yikes-inc-easy-mailchimp-extender' ) . '</a>'; ?>
 	</p>
 	
 	<!-- Settings Form -->
@@ -29,21 +29,21 @@ 
 		
 		<?php settings_fields( 'yikes_inc_easy_mc_recaptcha_settings_page' ); ?>
 		
-			<label for="yikes-mc-recaptcha-setting"><strong><?php _e( 'Enable reCAPTCHA Protection' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-				<input type="checkbox" name="yikes-mc-recaptcha-status" class="recaptcha-setting-checkbox" value="1" <?php checked( get_option( 'yikes-mc-recaptcha-status' , '' ) , '1' ); ?>>
+			<label for="yikes-mc-recaptcha-setting"><strong><?php _e( 'Enable reCAPTCHA Protection', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+				<input type="checkbox" name="yikes-mc-recaptcha-status" class="recaptcha-setting-checkbox" value="1" <?php checked( get_option( 'yikes-mc-recaptcha-status', '' ), '1' ); ?>>
 			</label>
 			
-			<label for="yikes-mc-recaptcha-api-key"><strong><?php _e( 'reCAPTCHA Site Key' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-				<input type="text" class="widefat recaptcha-setting-checkbox" name="yikes-mc-recaptcha-site-key" value="<?php echo esc_attr( get_option( 'yikes-mc-recaptcha-site-key' , '' ) ); ?>">
+			<label for="yikes-mc-recaptcha-api-key"><strong><?php _e( 'reCAPTCHA Site Key', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+				<input type="text" class="widefat recaptcha-setting-checkbox" name="yikes-mc-recaptcha-site-key" value="<?php echo esc_attr( get_option( 'yikes-mc-recaptcha-site-key', '' ) ); ?>">
 			</label>
 			
-			<label for="yikes-mc-recaptcha-private-api-key"><strong><?php _e( 'reCAPTCHA Secret Key' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-				<input type="text" class="widefat recaptcha-setting-checkbox" name="yikes-mc-recaptcha-secret-key" id="" value="<?php echo esc_attr( get_option( 'yikes-mc-recaptcha-secret-key' , '' ) ); ?>">
+			<label for="yikes-mc-recaptcha-private-api-key"><strong><?php _e( 'reCAPTCHA Secret Key', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+				<input type="text" class="widefat recaptcha-setting-checkbox" name="yikes-mc-recaptcha-secret-key" id="" value="<?php echo esc_attr( get_option( 'yikes-mc-recaptcha-secret-key', '' ) ); ?>">
 			</label>
 			
-			<a href="#" onclick="jQuery(this).next().slideToggle();return false;" class="recaptcha-preview-link"><?php _e( 'View reCAPTCHA Preview' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+			<a href="#" onclick="jQuery(this).next().slideToggle();return false;" class="recaptcha-preview-link"><?php _e( 'View reCAPTCHA Preview', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 				<span class="recaptcha-preview-container">
-					<img src="<?php echo YIKES_MC_URL . 'includes/images/recaptcha/recaptcha-demo.gif'; ?>" alt="<?php _e( 'reCAPTCHA Preview' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="recaptcha-demo-gif">
+					<img src="<?php echo YIKES_MC_URL . 'includes/images/recaptcha/recaptcha-demo.gif'; ?>" alt="<?php _e( 'reCAPTCHA Preview', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="recaptcha-demo-gif">
 				</span>
 			
 			

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * Options page for storing our reCAPTCHA options
- *
- * Page template that houses our reCAPTCHA API keys.
- *
- * @since 6.0.0
- *
- * @package WordPress
- * @subpackage Component
+						 * Options page for storing our reCAPTCHA options
+						 *
+						 * Page template that houses our reCAPTCHA API keys.
+						 *
+						 * @since 6.0.0
+						 *
+						 * @package WordPress
+						 * @subpackage Component
 */
 
 ?>

admin/partials/menu/options-sections/templates/integration-interest-groups.php

Spacing +22 added lines, -22 removed lines

@@ -2,7 +2,7 @@ 
 
 // print_r( $interest_groupings );
 
-$integration_options = get_option( 'optin-checkbox-init' , '' );	
+$integration_options = get_option( 'optin-checkbox-init', '' );	
 
 // print_r( $integration_options );
 
@@ -11,8 +11,8 @@ 
 /*
 * Confirm the interest groups is an array and not empty or else bail
 */
-if( isset( $interest_groupings['error'] ) ) {
-	echo '<p class="description no-interest-groupings-enabled-message">' . $interest_groupings['error'] . '</p>';
+if ( isset( $interest_groupings[ 'error' ] ) ) {
+	echo '<p class="description no-interest-groupings-enabled-message">' . $interest_groupings[ 'error' ] . '</p>';
 	return;
 }
 
@@ -25,30 +25,30 @@ 
 /*
 *	Loop over interest groups
 */
-foreach( $interest_groupings as $interest_group ) {
+foreach ( $interest_groupings as $interest_group ) {
 	
-	$interest_group_id = $interest_group['id'];
-	$interest_group_type = ( isset( $interest_group['form_field'] ) ) ? $interest_group['form_field'] : '';
-	$interest_groups_fields = ( isset( $interest_group['groups'] ) ) ? $interest_group['groups'] : false; // if not set return false
-	$selected_interest_groups = ( isset( $integration_options[$integration_type]['interest-groups'] ) ) ? $integration_options[$integration_type]['interest-groups'] : array();
+	$interest_group_id = $interest_group[ 'id' ];
+	$interest_group_type = ( isset( $interest_group[ 'form_field' ] ) ) ? $interest_group[ 'form_field' ] : '';
+	$interest_groups_fields = ( isset( $interest_group[ 'groups' ] ) ) ? $interest_group[ 'groups' ] : false; // if not set return false
+	$selected_interest_groups = ( isset( $integration_options[ $integration_type ][ 'interest-groups' ] ) ) ? $integration_options[ $integration_type ][ 'interest-groups' ] : array();
 	?>
 	<section class="interest-group-section">
-		<strong class="interest-group-section-title"><?php echo ucwords( $interest_group['name'] ); ?></strong>
+		<strong class="interest-group-section-title"><?php echo ucwords( $interest_group[ 'name' ] ); ?></strong>
 	<?php
 	/*
 	*	Loop over the interest group types, and return the appropriate type
 	*/	
-	switch( $interest_group_type ) {
+	switch ( $interest_group_type ) {
 	
 		default:
 		case 'hidden':
 		case 'checkboxes':
-			if( $interest_groups_fields ) {
-				foreach( $interest_groups_fields as $field ) {
+			if ( $interest_groups_fields ) {
+				foreach ( $interest_groups_fields as $field ) {
 				?>
 					<label>
-						<input type="checkbox" name="optin-checkbox-init[<?php echo $integration_type; ?>][interest-groups][<?php echo $interest_group_id; ?>][]" value="<?php echo $field['name']; ?>" <?php if( isset( $selected_interest_groups[$interest_group_id] ) ) {  if( in_array( $field['name'], $selected_interest_groups[$interest_group_id] ) ) { ?> checked="checked" <?php } } ?>>
-						<?php echo $field['name']; ?>
+						<input type="checkbox" name="optin-checkbox-init[<?php echo $integration_type; ?>][interest-groups][<?php echo $interest_group_id; ?>][]" value="<?php echo $field[ 'name' ]; ?>" <?php if ( isset( $selected_interest_groups[ $interest_group_id ] ) ) {  if ( in_array( $field[ 'name' ], $selected_interest_groups[ $interest_group_id ] ) ) { ?> checked="checked" <?php } } ?>>
+						<?php echo $field[ 'name' ]; ?>
 					</label>
 				<?php
 				}
@@ -56,13 +56,13 @@ 
 			break;
 			
 		case 'radio':
-			if( $interest_groups_fields ) {
+			if ( $interest_groups_fields ) {
 				$x = 1; //  used to decide which is pre-checked
-				foreach( $interest_groups_fields as $field ) {
+				foreach ( $interest_groups_fields as $field ) {
 				?>
 					<label>
-						<input type="radio" name="optin-checkbox-init[<?php echo $integration_type; ?>][interest-groups][<?php echo $interest_group_id; ?>][]" value="<?php echo $field['name']; ?>" <?php if( isset( $selected_interest_groups[$interest_group_id] ) ) {  if( in_array( $field['name'], $selected_interest_groups[$interest_group_id] ) ) { ?> checked="checked" <?php } } elseif( $x == 1 ) { ?> checked="checked" <?php }?>>
-						<?php echo $field['name']; ?>
+						<input type="radio" name="optin-checkbox-init[<?php echo $integration_type; ?>][interest-groups][<?php echo $interest_group_id; ?>][]" value="<?php echo $field[ 'name' ]; ?>" <?php if ( isset( $selected_interest_groups[ $interest_group_id ] ) ) {  if ( in_array( $field[ 'name' ], $selected_interest_groups[ $interest_group_id ] ) ) { ?> checked="checked" <?php } } elseif ( $x == 1 ) { ?> checked="checked" <?php }?>>
+						<?php echo $field[ 'name' ]; ?>
 					</label>
 				<?php
 					$x++;
@@ -71,12 +71,12 @@ 
 			break;
 			
 		case 'dropdown':
-			if( $interest_groups_fields ) {
+			if ( $interest_groups_fields ) {
 				?><select name="optin-checkbox-init[<?php echo $integration_type; ?>][interest-groups][<?php echo $interest_group_id; ?>][]"><?php
-				foreach( $interest_groups_fields as $field ) {
+				foreach ( $interest_groups_fields as $field ) {
 				?>
-					<option  value="<?php echo $field['name']; ?>" <?php if( isset( $selected_interest_groups[$interest_group_id] ) ) {  if( in_array( $field['name'], $selected_interest_groups[$interest_group_id] ) ) { ?> selected="selected" <?php } } ?>>
-						<?php echo $field['name']; ?>
+					<option  value="<?php echo $field[ 'name' ]; ?>" <?php if ( isset( $selected_interest_groups[ $interest_group_id ] ) ) {  if ( in_array( $field[ 'name' ], $selected_interest_groups[ $interest_group_id ] ) ) { ?> selected="selected" <?php } } ?>>
+						<?php echo $field[ 'name' ]; ?>
 					</option>
 				<?php
 				}