yikesinc / yikes-inc-easy-mailchimp-extender

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 -->

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;

class-map.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-return array (
+return array(
   'yikes_inc_easy_mailchimp_forms_admin' => 'admin/class-yikes-inc-easy-mailchimp-extender-admin.php',
   'yikes_inc_easy_mailchimp_process_ajax' => 'admin/partials/ajax/class.ajax.php',
   'yikes_inc_easy_mailchimp_dashboard_widgets' => 'admin/partials/dashboard-widgets/class.list-activity-widget.php',

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

Doc Comments +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 	 *
 	 * @param int $form_id The ID of the form to retrieve.
 	 *
-	 * @return array The array of form data.
+	 * @return string The array of form data.
 	 */
 	public function get_form( $form_id ) {
 		$all_forms = $this->get_all_forms();

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
 	 * @return bool Whether the form was successfully updated.
 	 */
 	public function update_form( $form_id, $data ) {
-		$data['id'] = $form_id;
+		$data[ 'id' ] = $form_id;
 		$all_forms  = $this->get_all_forms();
 
 		if ( ! isset( $all_forms[ $form_id ] ) ) {
@@ -79,7 +79,7 @@ 
 		$all_ids         = $this->get_form_ids();
 		$last_id         = end( $all_ids );
 		$new_id          = false === $last_id ? 1 : $last_id + 1;
-		$form_data['id'] = $new_id;
+		$form_data[ 'id' ] = $new_id;
 
 		// Ensure our data is consistently sorted
 		ksort( $form_data );

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

Spacing +2 added lines, -2 removed lines

@@ -80,7 +80,7 @@ 
 		$titles  = array();
 		$content = array();
 		foreach ( $plugin_settings as $option_name => $option_value ) {
-			$titles[] = $option_name;
+			$titles[ ] = $option_name;
 		}
 
 		// Generate the output file.
@@ -103,7 +103,7 @@ 
 				fputcsv( $output_handle, $titles );
 				$first = false;
 			}
-			$content[] = $option_value;
+			$content[ ] = $option_value;
 
 		}
 		fputcsv( $output_handle, $content );

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

Spacing +5 added lines, -5 removed lines

@@ -93,7 +93,7 @@ 
 	 */
 	public function update_form( $form_id, $data ) {
 		// Prepare the data for the database.
-		$data['id'] = $form_id;
+		$data[ 'id' ] = $form_id;
 		$save_data  = $this->prepare_data_for_db( $data );
 		$formats    = $this->get_format_array( $save_data );
 
@@ -122,7 +122,7 @@ 
 		$form_data = yikes_deep_parse_args( $form_data, $this->get_form_defaults() );
 
 		// If there is an ID set, remove it
-		unset( $form_data['id'] );
+		unset( $form_data[ 'id' ] );
 
 		// Prepare the data for the database
 		$save_data = $this->prepare_data_for_db( $form_data );
@@ -302,11 +302,11 @@ 
 				case 'redirect_user_on_submit':
 				case 'redirect_page':
 				case 'id':
-					$formats[] = '%d';
+					$formats[ ] = '%d';
 					break;
 
 				default:
-					$formats[] = '%s';
+					$formats[ ] = '%s';
 			}
 		}
 
@@ -346,7 +346,7 @@ 
 				continue;
 			}
 
-			$data['id'] = $id;
+			$data[ 'id' ] = $id;
 			$_form_data = $this->prepare_data_for_db( $data );
 			$formats    = $this->get_format_array( $_form_data );
 

admin/partials/helpers/fields/yikes-mailchimp-select-field.php

Spacing +10 added lines, -10 removed lines

@@ -5,25 +5,25 @@
 	*	For help on using, see our documentation [https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/]
 	* 	@since 6.0
 	*/
-	if ( is_string( $form_data['custom_fields'] ) ) {
-		$field_data = json_decode( $form_data['custom_fields'] , true );
-	} elseif ( is_array( $form_data['custom_fields'] ) ) {
-		$field_data = $form_data['custom_fields'];
+	if ( is_string( $form_data[ 'custom_fields' ] ) ) {
+		$field_data = json_decode( $form_data[ 'custom_fields' ], true );
+	} elseif ( is_array( $form_data[ 'custom_fields' ] ) ) {
+		$field_data = $form_data[ 'custom_fields' ];
 	}
 ?>
 <div class="custom-field-section">
 	<!-- title -->
-	<strong><?php echo $field['label']; ?></strong>
+	<strong><?php echo $field[ 'label' ]; ?></strong>
 	
 	<!-- Dropdown -->
-	<select class="custom-select-field" name="custom-field[<?php echo $field['id']; ?>]">
-		<?php foreach( $field['options'] as $value => $label ) { ?>
-			<option value="<?php echo $value; ?>" <?php if( isset( $field_data[$field['id']] ) ) { selected( $field_data[$field['id']] , $value ); } ?>><?php echo $label; ?></option>
+	<select class="custom-select-field" name="custom-field[<?php echo $field[ 'id' ]; ?>]">
+		<?php foreach ( $field[ 'options' ] as $value => $label ) { ?>
+			<option value="<?php echo $value; ?>" <?php if ( isset( $field_data[ $field[ 'id' ] ] ) ) { selected( $field_data[ $field[ 'id' ] ], $value ); } ?>><?php echo $label; ?></option>
 		<?php } ?>
 	</select>
 	
 	<!-- description -->
-	<?php if( isset( $field['description'] ) && $field['description'] != '' ) { ?>
-		<p class="description"><?php echo $field['description']; ?></p>
+	<?php if ( isset( $field[ 'description' ] ) && $field[ 'description' ] != '' ) { ?>
+		<p class="description"><?php echo $field[ 'description' ]; ?></p>
 	<?php } ?>
 </div>
\ No newline at end of file

admin/partials/helpers/fields/yikes-mailchimp-text-field.php

Spacing +8 added lines, -8 removed lines

@@ -5,16 +5,16 @@
 	*	For help on using, see our documentation [https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/]
 	* 	@since 6.0
 	*/
-	if ( is_string( $form_data['custom_fields'] ) ) {
-		$field_data = json_decode( $form_data['custom_fields'] , true );
-	} elseif ( is_array( $form_data['custom_fields'] ) ) {
-		$field_data = $form_data['custom_fields'];
+	if ( is_string( $form_data[ 'custom_fields' ] ) ) {
+		$field_data = json_decode( $form_data[ 'custom_fields' ], true );
+	} elseif ( is_array( $form_data[ 'custom_fields' ] ) ) {
+		$field_data = $form_data[ 'custom_fields' ];
 	}
 ?>
 <label class="custom-field-section">
-	<strong><?php echo $field['label']; ?></strong>
-	<input type="text" class="widefat" name="custom-field[<?php echo $field['id']; ?>]" id="custom-field" value="<?php echo isset( $field_data[$field['id']] ) ? $field_data[$field['id']] : ''; ?>" placeholder="<?php echo isset( $field['placeholder'] ) ? $field['placeholder'] : ''; ?>">
-	<?php if( isset( $field['description'] ) && $field['description'] != '' ) { ?>
-	<p class="description"><?php echo $field['description']; ?></p>
+	<strong><?php echo $field[ 'label' ]; ?></strong>
+	<input type="text" class="widefat" name="custom-field[<?php echo $field[ 'id' ]; ?>]" id="custom-field" value="<?php echo isset( $field_data[ $field[ 'id' ] ] ) ? $field_data[ $field[ 'id' ] ] : ''; ?>" placeholder="<?php echo isset( $field[ 'placeholder' ] ) ? $field[ 'placeholder' ] : ''; ?>">
+	<?php if ( isset( $field[ 'description' ] ) && $field[ 'description' ] != '' ) { ?>
+	<p class="description"><?php echo $field[ 'description' ]; ?></p>
 	<?php } ?>
 </label>
\ No newline at end of file

admin/partials/helpers/fields/yikes-mailchimp-checkbox-field.php

Spacing +8 added lines, -8 removed lines

@@ -5,16 +5,16 @@
 *	For help on using, see our documentation [https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/]
 * 	@since 6.0
 */
-	if ( is_string( $form_data['custom_fields'] ) ) {
-		$field_data = json_decode( $form_data['custom_fields'] , true );
-	} elseif ( is_array( $form_data['custom_fields'] ) ) {
-		$field_data = $form_data['custom_fields'];
+	if ( is_string( $form_data[ 'custom_fields' ] ) ) {
+		$field_data = json_decode( $form_data[ 'custom_fields' ], true );
+	} elseif ( is_array( $form_data[ 'custom_fields' ] ) ) {
+		$field_data = $form_data[ 'custom_fields' ];
 	}
 ?>
 <label class="custom-field-section">
-	<strong><?php echo $field['label']; ?></strong>
-	<input type="checkbox" class="widefat" name="custom-field[<?php echo $field['id']; ?>]" id="custom-field" value="1" <?php checked( isset( $field_data[$field['id']] ) ? $field_data[$field['id']] : 0, 1, true ); ?>>
-	<?php if( isset( $field['description'] ) && $field['description'] != '' ) { ?>
-	<p class="description"><?php echo $field['description']; ?></p>
+	<strong><?php echo $field[ 'label' ]; ?></strong>
+	<input type="checkbox" class="widefat" name="custom-field[<?php echo $field[ 'id' ]; ?>]" id="custom-field" value="1" <?php checked( isset( $field_data[ $field[ 'id' ] ] ) ? $field_data[ $field[ 'id' ] ] : 0, 1, true ); ?>>
+	<?php if ( isset( $field[ 'description' ] ) && $field[ 'description' ] != '' ) { ?>
+	<p class="description"><?php echo $field[ 'description' ]; ?></p>
 	<?php } ?>
 </label>