Strategy11 / formidable-forms

square/controllers/FrmSquareLiteAppController.php

Spacing +5 added lines, -5 removed lines

@@ -123,9 +123,9 @@ 
 		$address_setting    = $action->post_content['billing_address'];
 
 		$entry      = self::generate_false_entry();
-		$first_name = $first_name_setting && isset( $entry->metas[ $first_name_setting ] ) ? $entry->metas[ $first_name_setting ] : '';
-		$last_name  = $last_name_setting && isset( $entry->metas[ $last_name_setting ] ) ? $entry->metas[ $last_name_setting ] : '';
-		$address    = $address_setting && isset( $entry->metas[ $address_setting ] ) ? $entry->metas[ $address_setting ] : '';
+		$first_name = $first_name_setting && isset( $entry->metas[$first_name_setting] ) ? $entry->metas[$first_name_setting] : '';
+		$last_name  = $last_name_setting && isset( $entry->metas[$last_name_setting] ) ? $entry->metas[$last_name_setting] : '';
+		$address    = $address_setting && isset( $entry->metas[$address_setting] ) ? $entry->metas[$address_setting] : '';
 
 		if ( is_array( $first_name ) && isset( $first_name['first'] ) ) {
 			$first_name = $first_name['first'];
@@ -141,7 +141,7 @@ 
 		);
 
 		if ( $email_setting ) {
-			$shortcode_atts   = array(
+			$shortcode_atts = array(
 				'entry' => $entry,
 				'form'  => $action->menu_order,
 				'value' => $email_setting,
@@ -181,7 +181,7 @@ 
 				if ( is_array( $v ) ) {
 					foreach ( $v as $f => $value ) {
 						FrmAppHelper::sanitize_value( 'wp_kses_post', $value );
-						$entry->metas[ absint( $f ) ] = $value;
+						$entry->metas[absint( $f )] = $value;
 					}
 				}
 			} else {

square/controllers/FrmSquareLiteActionsController.php

Braces +4 added lines, -2 removed lines

@@ -139,7 +139,8 @@ 
 	 * @return string|true string on error, true on success.
 	 */
 	private static function trigger_one_time_payment( $atts ) {
-		if ( empty( $_POST['square-token'] ) || empty( $_POST['square-verification-token'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+		if ( empty( $_POST['square-token'] ) || empty( $_POST['square-verification-token'] ) ) {
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
 			return __( 'Please enter a valid credit card', 'formidable' );
 		}
 
@@ -199,7 +200,8 @@ 
 	 * @return bool|string True on success, error message on failure
 	 */
 	private static function trigger_recurring_payment( $atts ) {
-		if ( empty( $_POST['square-token'] ) || empty( $_POST['square-verification-token'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+		if ( empty( $_POST['square-token'] ) || empty( $_POST['square-verification-token'] ) ) {
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
 			return __( 'Please enter a valid credit card', 'formidable' );
 		}
 

Spacing +9 added lines, -9 removed lines

@@ -76,7 +76,7 @@ 
 			$gateway   = $payment_action->post_content['gateway'];
 			$is_square = $gateway === 'square' || ( is_array( $gateway ) && in_array( 'square', $gateway, true ) );
 			if ( ! $is_square || empty( $payment_action->post_content['amount'] ) ) {
-				unset( $payment_actions[ $k ] );
+				unset( $payment_actions[$k] );
 			}
 		}
 		return $payment_actions;
@@ -97,7 +97,7 @@ 
 			'run_triggers' => false,
 			'show_errors'  => true,
 		);
-		$atts     = compact( 'action', 'entry', 'form' );
+		$atts = compact( 'action', 'entry', 'form' );
 
 		$amount = self::prepare_amount( $action->post_content['amount'], $atts );
 		if ( empty( $amount ) || $amount == 000 ) {
@@ -150,7 +150,7 @@ 
 				'value' => $atts['action']->post_content['description'],
 			)
 		);
-		$result             = FrmSquareLiteConnectHelper::create_payment( $atts['amount'], $currency, $square_token, $verification_token, $description );
+		$result = FrmSquareLiteConnectHelper::create_payment( $atts['amount'], $currency, $square_token, $verification_token, $description );
 
 		if ( false === $result ) {
 			return FrmSquareLiteConnectHelper::get_latest_error_from_square_api();
@@ -455,7 +455,7 @@ 
 			false
 		);
 
-		$square_vars     = array(
+		$square_vars = array(
 			'formId'     => $form_id,
 			'nonce'      => wp_create_nonce( 'frm_square_ajax' ),
 			'ajax'       => esc_url_raw( FrmAppHelper::get_ajax_url() ),
@@ -572,7 +572,7 @@ 
 		$disallowed = array( ';', ':', '!important' );
 		foreach ( $settings as $k => $s ) {
 			if ( is_string( $s ) ) {
-				$settings[ $k ] = str_replace( $disallowed, '', $s );
+				$settings[$k] = str_replace( $disallowed, '', $s );
 			}
 		}
 
@@ -598,11 +598,11 @@ 
 
 		$field_id = isset( $field->temp_id ) ? $field->temp_id : $field->id;
 
-		if ( isset( $errors[ 'field' . $field_id . '-cc' ] ) ) {
-			unset( $errors[ 'field' . $field_id . '-cc' ] );
+		if ( isset( $errors['field' . $field_id . '-cc'] ) ) {
+			unset( $errors['field' . $field_id . '-cc'] );
 		}
-		if ( isset( $errors[ 'field' . $field_id ] ) ) {
-			unset( $errors[ 'field' . $field_id ] );
+		if ( isset( $errors['field' . $field_id] ) ) {
+			unset( $errors['field' . $field_id] );
 		}
 
 		return $errors;

stripe/controllers/FrmTransLiteActionsController.php

Spacing +4 added lines, -4 removed lines

@@ -472,8 +472,8 @@ 
 			return $values;
 		}
 
-		if ( is_array( $previous_entry->metas ) && isset( $previous_entry->metas[ $field->id ] ) ) {
-			$values['value'] = $previous_entry->metas[ $field->id ];
+		if ( is_array( $previous_entry->metas ) && isset( $previous_entry->metas[$field->id] ) ) {
+			$values['value'] = $previous_entry->metas[$field->id];
 		}
 
 		$frm_vars['trans_filled'] = true;
@@ -508,7 +508,7 @@ 
 			 * @param Closure    $destroy_callback
 			 * @return void
 			 */
-			function () use ( $entry_id, &$destroy_callback ) {
+			function() use ( $entry_id, &$destroy_callback ) {
 				FrmEntry::destroy( $entry_id );
 				// Only call this once.
 				remove_action( 'frm_entry_form', $destroy_callback );
@@ -528,7 +528,7 @@ 
 	 * @return array
 	 */
 	public static function before_save_settings( $settings, $action ) {
-		$settings['gateway']  = ! empty( $settings['gateway'] ) ? (array) $settings['gateway'] : array( 'stripe' );
+		$settings['gateway'] = ! empty( $settings['gateway'] ) ? (array) $settings['gateway'] : array( 'stripe' );
 
 		if ( in_array( 'square', $settings['gateway'] ) ) {
 			$currency = FrmSquareLiteConnectHelper::get_merchant_currency();

classes/models/fields/FrmFieldType.php

Spacing +22 added lines, -22 removed lines

@@ -156,8 +156,8 @@ 
 		$field_val = '';
 		if ( is_object( $this->field ) ) {
 			$field_val = $this->field->{$column};
-		} elseif ( is_array( $this->field ) && isset( $this->field[ $column ] ) ) {
-			$field_val = $this->field[ $column ];
+		} elseif ( is_array( $this->field ) && isset( $this->field[$column] ) ) {
+			$field_val = $this->field[$column];
 		}
 
 		return $field_val;
@@ -171,7 +171,7 @@ 
 		if ( is_object( $this->field ) ) {
 			$this->field->{$column} = $value;
 		} elseif ( is_array( $this->field ) ) {
-			$this->field[ $column ] = $value;
+			$this->field[$column] = $value;
 		}
 	}
 
@@ -637,7 +637,7 @@ 
 			printf(
 				/* translators: %s: Field type */
 				esc_html__( '%s Options', 'formidable' ),
-				esc_html( $all_field_types[ $args['display']['type'] ]['name'] )
+				esc_html( $all_field_types[$args['display']['type']]['name'] )
 			);
 			FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown6_icon', array( 'aria-hidden' => 'true' ) );
 			?>
@@ -737,7 +737,7 @@ 
 	 * New field
 	 */
 	public function get_new_field_defaults() {
-		$field        = array(
+		$field = array(
 			'name'          => $this->get_new_field_name(),
 			'description'   => '',
 			'type'          => $this->type,
@@ -768,8 +768,8 @@ 
 
 		$fields = array_merge( $fields, $pro_fields );
 
-		if ( isset( $fields[ $this->type ] ) ) {
-			$name = is_array( $fields[ $this->type ] ) ? $fields[ $this->type ]['name'] : $fields[ $this->type ];
+		if ( isset( $fields[$this->type] ) ) {
+			$name = is_array( $fields[$this->type] ) ? $fields[$this->type]['name'] : $fields[$this->type];
 		}
 
 		return $name;
@@ -786,7 +786,7 @@ 
 	 * @return array
 	 */
 	public function get_default_field_options() {
-		$opts        = array(
+		$opts = array(
 			'size'               => '',
 			'max'                => '',
 			'label'              => '',
@@ -1030,7 +1030,7 @@ 
 	 * @return void
 	 */
 	public function set_aria_invalid_error( &$shortcode_atts, $args ) {
-		$shortcode_atts['aria-invalid'] = isset( $args['errors'][ 'field' . $this->field_id ] ) ? 'true' : 'false';
+		$shortcode_atts['aria-invalid'] = isset( $args['errors']['field' . $this->field_id] ) ? 'true' : 'false';
 	}
 
 	/**
@@ -1181,11 +1181,11 @@ 
 		}
 
 		$options = array_values( $this->field['options'] );
-		if ( ! isset( $options[ $opt ] ) ) {
+		if ( ! isset( $options[$opt] ) ) {
 			return $hidden;
 		}
 
-		$option = $options[ $opt ];
+		$option = $options[$opt];
 		if ( is_array( $option ) ) {
 			$option = $option['value'];
 		}
@@ -1249,8 +1249,8 @@ 
 		$selected = $values['field_value'];
 
 		if ( isset( $values['combo_name'] ) ) {
-			$options  = $options[ $values['combo_name'] ];
-			$selected = is_array( $selected ) && isset( $selected[ $values['combo_name'] ] ) ? $selected[ $values['combo_name'] ] : '';
+			$options  = $options[$values['combo_name']];
+			$selected = is_array( $selected ) && isset( $selected[$values['combo_name']] ) ? $selected[$values['combo_name']] : '';
 		}
 
 		$input = $this->select_tag( $values );
@@ -1305,7 +1305,7 @@ 
 	}
 
 	protected function fill_display_field_values( $args = array() ) {
-		$defaults        = array(
+		$defaults = array(
 			'field_name'    => 'item_meta[' . $this->get_field_column( 'id' ) . ']',
 			'field_id'      => $this->get_field_column( 'id' ),
 			'field_plus_id' => '',
@@ -1362,7 +1362,7 @@ 
 			}
 		}
 
-		if ( isset( $args['errors'][ 'field' . $args['field_id'] ] ) && ! $custom_error_fields ) {
+		if ( isset( $args['errors']['field' . $args['field_id']] ) && ! $custom_error_fields ) {
 			if ( $error_comes_first ) {
 				array_unshift( $describedby, 'frm_error_' . $args['html_id'] );
 			} else {
@@ -1440,11 +1440,11 @@ 
 
 		$field_id = $this->get_field_column( 'id' );
 		if ( ! array_key_exists( $field_id, $frm_validated_unique_values ) ) {
-			$frm_validated_unique_values[ $field_id ] = array();
+			$frm_validated_unique_values[$field_id] = array();
 			return false;
 		}
 
-		$already_validated_this_value = in_array( $value, $frm_validated_unique_values[ $field_id ], true );
+		$already_validated_this_value = in_array( $value, $frm_validated_unique_values[$field_id], true );
 		return $already_validated_this_value;
 	}
 
@@ -1469,7 +1469,7 @@ 
 	private function value_validated_as_unique( $value ) {
 		global $frm_validated_unique_values;
 		$field_id                                   = $this->get_field_column( 'id' );
-		$frm_validated_unique_values[ $field_id ][] = $value;
+		$frm_validated_unique_values[$field_id][] = $value;
 	}
 
 	/**
@@ -1514,8 +1514,8 @@ 
 		$value = $this->prepare_display_value( $value, $atts );
 
 		if ( is_array( $value ) ) {
-			if ( ! empty( $atts['show'] ) && isset( $value[ $atts['show'] ] ) ) {
-				$value = $value[ $atts['show'] ];
+			if ( ! empty( $atts['show'] ) && isset( $value[$atts['show']] ) ) {
+				$value = $value[$atts['show']];
 			} elseif ( empty( $atts['return_array'] ) ) {
 				$sep   = isset( $atts['sep'] ) ? $atts['sep'] : ', ';
 				$value = FrmAppHelper::safe_implode( $sep, $value );
@@ -1645,8 +1645,8 @@ 
 		$saved_entries = $atts['ids'];
 		$new_value     = array();
 		foreach ( (array) $value as $old_child_id ) {
-			if ( isset( $saved_entries[ $old_child_id ] ) ) {
-				$new_value[] = $saved_entries[ $old_child_id ];
+			if ( isset( $saved_entries[$old_child_id] ) ) {
+				$new_value[] = $saved_entries[$old_child_id];
 			}
 		}
 

classes/controllers/FrmSettingsController.php

Spacing +5 added lines, -5 removed lines

@@ -173,7 +173,7 @@ 
 				$section['function'] = $original;
 			}
 
-			$sections[ $key ] = $section;
+			$sections[$key] = $section;
 		}//end foreach
 
 		return $sections;
@@ -193,8 +193,8 @@ 
 
 		foreach ( $sections as $key => $section ) {
 			if ( in_array( $key, $payment_section_keys, true ) ) {
-				self::$removed_payments_sections[ $key ] = $section;
-				unset( $sections[ $key ] );
+				self::$removed_payments_sections[$key] = $section;
+				unset( $sections[$key] );
 			}
 		}
 
@@ -226,11 +226,11 @@ 
 
 		$section  = FrmAppHelper::get_post_param( 'tab', '', 'sanitize_text_field' );
 		$sections = self::get_settings_tabs();
-		if ( ! isset( $sections[ $section ] ) ) {
+		if ( ! isset( $sections[$section] ) ) {
 			wp_die();
 		}
 
-		$section = $sections[ $section ];
+		$section = $sections[$section];
 
 		if ( isset( $section['class'] ) ) {
 			call_user_func( array( $section['class'], $section['function'] ) );

classes/views/frm-settings/payments.php

Spacing +2 added lines, -2 removed lines

@@ -31,8 +31,8 @@
 	if ( $is_active ) {
 		$input_params['checked'] = 'checked';
 	}
-	$other_section_selectors      = array_map(
-		function ( $section ) {
+	$other_section_selectors = array_map(
+		function( $section ) {
 			return "#frm_{$section}_settings_section";
 		},
 		array_diff( array_keys( $payment_sections ), array( $key ) )

classes/views/frm-fields/front-end/combo-field/combo-field.php

Spacing +6 added lines, -6 removed lines

@@ -41,7 +41,7 @@ 
 			$sub_field_class   = "frm_form_field form-field frm_form_subfield-{$name} {$sub_field['wrapper_classes']}";
 			$sub_field_desc    = FrmField::get_option( $field, $name . '_desc' );
 
-			if ( isset( $errors[ 'field' . $field_id . '-' . $name ] ) ) {
+			if ( isset( $errors['field' . $field_id . '-' . $name] ) ) {
 				$sub_field_class .= ' frm_blank_field';
 			}
 			?>
@@ -60,11 +60,11 @@ 
 						$attrs = array(
 							'type'  => $sub_field['type'],
 							'id'    => $html_id . '_' . $name,
-							'value' => isset( $field_value[ $name ] ) ? $field_value[ $name ] : '',
+							'value' => isset( $field_value[$name] ) ? $field_value[$name] : '',
 						);
 
-						if ( ! empty( $field_value[ $name ] ) ) {
-							$attrs['data-frmval'] = $field_value[ $name ];
+						if ( ! empty( $field_value[$name] ) ) {
+							$attrs['data-frmval'] = $field_value[$name];
 						}
 						if ( empty( $args['remove_names'] ) ) {
 							$attrs['name'] = $field_name . '[' . $name . ']';
@@ -81,9 +81,9 @@ 
 				}
 
 				// Don't show individual field errors when there is a combo field error.
-				if ( ! empty( $errors ) && isset( $errors[ 'field' . $field_id . '-' . $name ] ) && ! isset( $errors[ 'field' . $field_id ] ) ) {
+				if ( ! empty( $errors ) && isset( $errors['field' . $field_id . '-' . $name] ) && ! isset( $errors['field' . $field_id] ) ) {
 					?>
-					<div class="frm_error" role="alert"><?php echo esc_html( $errors[ 'field' . $field_id . '-' . $name ] ); ?></div>
+					<div class="frm_error" role="alert"><?php echo esc_html( $errors['field' . $field_id . '-' . $name] ); ?></div>
 				<?php } ?>
 			</div>
 			<?php

classes/helpers/FrmCSVExportHelper.php

Spacing +54 added lines, -54 removed lines

@@ -154,7 +154,7 @@ 
 
 		unset( $filename );
 
-		$comment_count       = FrmDb::get_count(
+		$comment_count = FrmDb::get_count(
 			'frm_item_metas',
 			array(
 				'item_id'         => $atts['entry_ids'],
@@ -300,7 +300,7 @@ 
 	private static function prepare_csv_headings() {
 		$headings = array();
 		self::csv_headings( $headings );
-		$headings       = apply_filters(
+		$headings = apply_filters(
 			'frm_csv_columns',
 			$headings,
 			self::$form_id,
@@ -324,10 +324,10 @@ 
 		$field_headings  = array();
 		$separate_values = array( 'user_id', 'file', 'data', 'date' );
 		if ( ! empty( $col->field_options['separate_value'] ) && ! in_array( $col->type, $separate_values, true ) ) {
-			$field_headings[ $col->id . '_label' ] = strip_tags( $col->name . ' ' . __( '(label)', 'formidable' ) );
+			$field_headings[$col->id . '_label'] = strip_tags( $col->name . ' ' . __( '(label)', 'formidable' ) );
 		}
 
-		$field_headings[ $col->id ] = strip_tags( $col->name );
+		$field_headings[$col->id] = strip_tags( $col->name );
 		$field_headings             = apply_filters(
 			'frm_csv_field_columns',
 			$field_headings,
@@ -348,14 +348,14 @@ 
 			if ( self::is_the_child_of_a_repeater( $col ) ) {
 				$repeater_id = $col->field_options['in_section'];
 				// Set a placeholder to maintain order for repeater fields.
-				$headings[ 'repeater' . $repeater_id ] = array();
+				$headings['repeater' . $repeater_id] = array();
 
-				if ( ! isset( $fields_by_repeater_id[ $repeater_id ] ) ) {
-					$fields_by_repeater_id[ $repeater_id ] = array();
+				if ( ! isset( $fields_by_repeater_id[$repeater_id] ) ) {
+					$fields_by_repeater_id[$repeater_id] = array();
 					$repeater_ids[]                        = $repeater_id;
 				}
 
-				$fields_by_repeater_id[ $repeater_id ][] = $col;
+				$fields_by_repeater_id[$repeater_id][] = $col;
 
 				continue;
 			}
@@ -374,8 +374,8 @@ 
 				$end    = strpos( $row->meta_value, ':{' );
 				$length = substr( $row->meta_value, $start, $end - $start );
 
-				if ( $length > $max[ $row->field_id ] ) {
-					$max[ $row->field_id ] = $length;
+				if ( $length > $max[$row->field_id] ) {
+					$max[$row->field_id] = $length;
 				}
 			}
 			unset( $start, $end, $length, $row, $repeater_meta, $where );
@@ -386,17 +386,17 @@ 
 					$repeater_id = str_replace( 'repeater', '', $key );
 
 					$repeater_headings = array();
-					foreach ( $fields_by_repeater_id[ $repeater_id ] as $col ) {
+					foreach ( $fields_by_repeater_id[$repeater_id] as $col ) {
 						$repeater_headings += self::field_headings( $col );
 					}
 
-					for ( $i = 0; $i < $max[ $repeater_id ]; $i++ ) {
+					for ( $i = 0; $i < $max[$repeater_id]; $i ++ ) {
 						foreach ( $repeater_headings as $repeater_key => $repeater_name ) {
-							$flat[ $repeater_key . '[' . $i . ']' ] = $repeater_name;
+							$flat[$repeater_key . '[' . $i . ']'] = $repeater_name;
 						}
 					}
 				} else {
-					$flat[ $key ] = $heading;
+					$flat[$key] = $heading;
 				}
 			}
 
@@ -409,10 +409,10 @@ 
 		}//end if
 
 		if ( self::$comment_count ) {
-			for ( $i = 0; $i < self::$comment_count; $i++ ) {
-				$headings[ 'comment' . $i ]            = __( 'Comment', 'formidable' );
-				$headings[ 'comment_user_id' . $i ]    = __( 'Comment User', 'formidable' );
-				$headings[ 'comment_created_at' . $i ] = __( 'Comment Date', 'formidable' );
+			for ( $i = 0; $i < self::$comment_count; $i ++ ) {
+				$headings['comment' . $i]            = __( 'Comment', 'formidable' );
+				$headings['comment_user_id' . $i]    = __( 'Comment User', 'formidable' );
+				$headings['comment_created_at' . $i] = __( 'Comment Date', 'formidable' );
 			}
 			unset( $i );
 		}
@@ -457,7 +457,7 @@ 
 
 	private static function prepare_next_csv_rows( $next_set ) {
 		if ( FrmAppHelper::pro_is_installed() ) {
-			$where    = array(
+			$where = array(
 				'or'             => 1,
 				'id'             => $next_set,
 				'parent_item_id' => $next_set,
@@ -514,32 +514,32 @@ 
 					continue;
 				}
 
-				if ( ! isset( $entries[ self::$entry->parent_item_id ] ) ) {
-					$entries[ self::$entry->parent_item_id ]        = new stdClass();
-					$entries[ self::$entry->parent_item_id ]->metas = array();
+				if ( ! isset( $entries[self::$entry->parent_item_id] ) ) {
+					$entries[self::$entry->parent_item_id]        = new stdClass();
+					$entries[self::$entry->parent_item_id]->metas = array();
 				}
 
-				if ( ! isset( $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] ) ) {
-					$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] = array();
-				} elseif ( ! is_array( $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] ) ) {
+				if ( ! isset( $entries[self::$entry->parent_item_id]->metas[$meta_id] ) ) {
+					$entries[self::$entry->parent_item_id]->metas[$meta_id] = array();
+				} elseif ( ! is_array( $entries[self::$entry->parent_item_id]->metas[$meta_id] ) ) {
 					// if the data is here, it should be an array but if this field has collected data
 					// both while inside and outside of the repeating section, it's possible this is a string.
-					$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] = (array) $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ];
+					$entries[self::$entry->parent_item_id]->metas[$meta_id] = (array) $entries[self::$entry->parent_item_id]->metas[$meta_id];
 				}
 
 				// Add the repeated values.
-				$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ][] = $meta_value;
+				$entries[self::$entry->parent_item_id]->metas[$meta_id][] = $meta_value;
 			}//end foreach
 
 			self::$entry->metas                              = self::fill_missing_repeater_metas( self::$entry->metas, $entries );
-			$entries[ self::$entry->parent_item_id ]->metas += self::$entry->metas;
+			$entries[self::$entry->parent_item_id]->metas += self::$entry->metas;
 		}//end if
 
 		// add the embedded form id
-		if ( ! isset( $entries[ self::$entry->parent_item_id ]->embedded_fields ) ) {
-			$entries[ self::$entry->parent_item_id ]->embedded_fields = array();
+		if ( ! isset( $entries[self::$entry->parent_item_id]->embedded_fields ) ) {
+			$entries[self::$entry->parent_item_id]->embedded_fields = array();
 		}
-		$entries[ self::$entry->parent_item_id ]->embedded_fields[ self::$entry->id ] = self::$entry->form_id;
+		$entries[self::$entry->parent_item_id]->embedded_fields[self::$entry->id] = self::$entry->form_id;
 	}
 
 	/**
@@ -560,19 +560,19 @@ 
 		}
 
 		$repeater_id = $field->field_options['in_section'];
-		if ( ! isset( self::$fields_by_repeater_id[ $repeater_id ] ) ) {
+		if ( ! isset( self::$fields_by_repeater_id[$repeater_id] ) ) {
 			return $metas;
 		}
 
-		foreach ( self::$fields_by_repeater_id[ $repeater_id ] as $repeater_child ) {
-			if ( ! isset( $metas[ $repeater_child->id ] ) ) {
-				$metas[ $repeater_child->id ] = '';
+		foreach ( self::$fields_by_repeater_id[$repeater_id] as $repeater_child ) {
+			if ( ! isset( $metas[$repeater_child->id] ) ) {
+				$metas[$repeater_child->id] = '';
 
-				if ( ! isset( $entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ] ) || ! is_array( $entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ] ) ) {
-					$entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ] = array();
+				if ( ! isset( $entries[self::$entry->parent_item_id]->metas[$repeater_child->id] ) || ! is_array( $entries[self::$entry->parent_item_id]->metas[$repeater_child->id] ) ) {
+					$entries[self::$entry->parent_item_id]->metas[$repeater_child->id] = array();
 				}
 
-				$entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ][] = '';
+				$entries[self::$entry->parent_item_id]->metas[$repeater_child->id][] = '';
 			}
 		}
 
@@ -591,7 +591,7 @@ 
 
 	private static function add_field_values_to_csv( &$row ) {
 		foreach ( self::$fields as $col ) {
-			$field_value = isset( self::$entry->metas[ $col->id ] ) ? self::$entry->metas[ $col->id ] : false;
+			$field_value = isset( self::$entry->metas[$col->id] ) ? self::$entry->metas[$col->id] : false;
 
 			FrmFieldsHelper::prepare_field_value( $field_value, $col->type );
 
@@ -613,20 +613,20 @@ 
 			if ( ! empty( $col->field_options['separate_value'] ) ) {
 				$label_key = $col->id . '_label';
 				if ( self::is_the_child_of_a_repeater( $col ) ) {
-					$row[ $label_key ] = array();
+					$row[$label_key] = array();
 
 					if ( is_array( $field_value ) ) {
 						foreach ( $field_value as $value ) {
-							$row[ $label_key ][] = self::get_separate_value_label( $value, $col );
+							$row[$label_key][] = self::get_separate_value_label( $value, $col );
 						}
 					}
 				} else {
-					$row[ $label_key ] = self::get_separate_value_label( $field_value, $col );
+					$row[$label_key] = self::get_separate_value_label( $field_value, $col );
 				}
 				unset( $label_key );
 			}
 
-			$row[ $col->id ] = $field_value;
+			$row[$col->id] = $field_value;
 
 			unset( $col, $field_value );
 		}//end foreach
@@ -649,7 +649,7 @@ 
 				'show_icon'         => false,
 				'entry_id'          => self::$entry->id,
 				'sep'               => self::$separator,
-				'embedded_field_id' => isset( self::$entry->embedded_fields ) && isset( self::$entry->embedded_fields[ self::$entry->id ] ) ? 'form' . self::$entry->embedded_fields[ self::$entry->id ] : 0,
+				'embedded_field_id' => isset( self::$entry->embedded_fields ) && isset( self::$entry->embedded_fields[self::$entry->id] ) ? 'form' . self::$entry->embedded_fields[self::$entry->id] : 0,
 			)
 		);
 	}
@@ -664,8 +664,8 @@ 
 					// This is combo field inside repeater. The heading key has this format: [86_first[0]].
 					foreach ( $sub_value as $sub_key => $sub_sub_value ) {
 						$column_key = $atts['col']->id . '_' . $sub_key . '[' . $key . ']';
-						if ( ! is_numeric( $sub_key ) && isset( self::$headings[ $column_key ] ) ) {
-							$row[ $column_key ] = $sub_sub_value;
+						if ( ! is_numeric( $sub_key ) && isset( self::$headings[$column_key] ) ) {
+							$row[$column_key] = $sub_sub_value;
 						}
 					}
 
@@ -673,8 +673,8 @@ 
 				}
 
 				$column_key = $atts['col']->id . '_' . $key;
-				if ( ! is_numeric( $key ) && isset( self::$headings[ $column_key ] ) ) {
-					$row[ $column_key ] = $sub_value;
+				if ( ! is_numeric( $key ) && isset( self::$headings[$column_key] ) ) {
+					$row[$column_key] = $sub_value;
 				}
 			}
 		}
@@ -699,18 +699,18 @@ 
 		$echo = 'echo' === self::$mode;
 
 		foreach ( self::$headings as $k => $heading ) {
-			if ( isset( $rows[ $k ] ) ) {
-				$row = $rows[ $k ];
+			if ( isset( $rows[$k] ) ) {
+				$row = $rows[$k];
 			} else {
 				$row = '';
 				// array indexed data is not at $rows[ $k ]
-				if ( $k[ strlen( $k ) - 1 ] === ']' ) {
+				if ( $k[strlen( $k ) - 1] === ']' ) {
 					$start = strrpos( $k, '[' );
-					$key   = substr( $k, 0, $start++ );
+					$key   = substr( $k, 0, $start ++ );
 					$index = substr( $k, $start, strlen( $k ) - 1 - $start );
 
-					if ( isset( $rows[ $key ] ) && isset( $rows[ $key ][ $index ] ) ) {
-						$row = $rows[ $key ][ $index ];
+					if ( isset( $rows[$key] ) && isset( $rows[$key][$index] ) ) {
+						$row = $rows[$key][$index];
 					}
 
 					unset( $start, $key, $index );