Strategy11 / formidable-forms

classes/controllers/FrmXMLController.php

Spacing +11 added lines, -11 removed lines

@@ -121,7 +121,7 @@ 
 			return;
 		}
 
-		$selected_xml  = isset( $form['xml'] ) && isset( $form['xml'][ $selected_form ] ) ? $form['xml'][ $selected_form ] : '';
+		$selected_xml = isset( $form['xml'] ) && isset( $form['xml'][$selected_form] ) ? $form['xml'][$selected_form] : '';
 		if ( empty( $selected_xml ) || strpos( $selected_xml, 'http' ) !== 0 ) {
 			return;
 		}
@@ -133,8 +133,8 @@ 
 	 * @since 4.06.02
 	 */
 	private static function get_selected_in_form( $form, $value = 'form' ) {
-		if ( ! empty( $form ) && isset( $form[ $value ] ) && ! empty( $form[ $value ] ) ) {
-			return $form[ $value ];
+		if ( ! empty( $form ) && isset( $form[$value] ) && ! empty( $form[$value] ) ) {
+			return $form[$value];
 		}
 
 		return '';
@@ -163,7 +163,7 @@ 
 			}
 
 			if ( $for === 'view' ) {
-				$item_key  = is_array( $view_keys ) ? $view_keys[ $form_key ] : $view_keys;
+				$item_key  = is_array( $view_keys ) ? $view_keys[$form_key] : $view_keys;
 				$shortcode = '[display-frm-data id=%1$s filter=limited]';
 			} elseif ( $for === 'form' ) {
 				$item_key = $form_key;
@@ -178,7 +178,7 @@ 
 				continue;
 			}
 
-			$page_ids[ $for ] = wp_insert_post(
+			$page_ids[$for] = wp_insert_post(
 				array(
 					'post_title'   => $name,
 					'post_type'    => 'page',
@@ -319,7 +319,7 @@ 
 		// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.MissingUnslash
 		$file_type = sanitize_option( 'upload_path', $_FILES['frm_import_file']['name'] );
 		$file_type = strtolower( pathinfo( $file_type, PATHINFO_EXTENSION ) );
-		if ( 'xml' !== $file_type && isset( $export_format[ $file_type ] ) ) {
+		if ( 'xml' !== $file_type && isset( $export_format[$file_type] ) ) {
 			// allow other file types to be imported
 			do_action( 'frm_before_import_' . $file_type );
 
@@ -402,7 +402,7 @@ 
 		foreach ( $type as $tb_type ) {
 			$where = array();
 			$join  = '';
-			$table = $tables[ $tb_type ];
+			$table = $tables[$tb_type];
 
 			$select     = $table . '.id';
 			$query_vars = array();
@@ -417,7 +417,7 @@ 
 							$table . '.parent_form_id' => $args['ids'],
 						);
 					} else {
-						$where[ $table . '.status !' ] = 'draft';
+						$where[$table . '.status !'] = 'draft';
 					}
 					break;
 				case 'actions':
@@ -430,7 +430,7 @@ 
 				case 'items':
 					// $join = "INNER JOIN {$wpdb->prefix}frm_item_metas im ON ($table.id = im.item_id)";
 					if ( $args['ids'] ) {
-						$where[ $table . '.form_id' ] = $args['ids'];
+						$where[$table . '.form_id'] = $args['ids'];
 					}
 					break;
 				case 'styles':
@@ -471,7 +471,7 @@ 
 					}
 			}
 
-			$records[ $tb_type ] = FrmDb::get_col( $table . $join, $where, $select );
+			$records[$tb_type] = FrmDb::get_col( $table . $join, $where, $select );
 			unset( $tb_type );
 		}
 
@@ -616,7 +616,7 @@ 
 		$no_export_fields = FrmField::no_save_fields();
 		foreach ( $csv_fields as $k => $f ) {
 			if ( in_array( $f->type, $no_export_fields, true ) ) {
-				unset( $csv_fields[ $k ] );
+				unset( $csv_fields[$k] );
 			}
 		}
 

classes/views/frm-fields/back-end/field-multiple.php

Spacing +1 added lines, -1 removed lines

@@ -9,6 +9,6 @@
 	$type = $field['type'];
 	do_action( 'frm_after_checkbox', compact( 'field', 'field_name', 'type' ) );
 } else {
-	$read_only  = $field['read_only'];
+	$read_only = $field['read_only'];
 	include dirname( __FILE__ ) . '/' . $field['type'] . '-field.php';
 }

classes/controllers/FrmAppController.php

Spacing +1 added lines, -1 removed lines

@@ -283,7 +283,7 @@
 				'content' => 'upgrade',
 			)
 		);
-		$renew_link       = FrmAppHelper::admin_upgrade_link(
+		$renew_link = FrmAppHelper::admin_upgrade_link(
 			array(
 				'medium'  => 'new-template',
 				'content' => 'renew',

classes/helpers/FrmEntriesListHelper.php

Spacing +3 added lines, -3 removed lines

@@ -25,7 +25,7 @@ 
 			$s_query['it.form_id'] = $form_id;
 			$join_form_in_query    = false;
 		} else {
-			$s_query[]          = array(
+			$s_query[] = array(
 				'or'               => 1,
 				'parent_form_id'   => null,
 				'parent_form_id <' => 1,
@@ -56,7 +56,7 @@ 
 
 		if ( strpos( $orderby, 'meta' ) !== false ) {
 			$order_field_type = FrmField::get_type( str_replace( 'meta_', '', $orderby ) );
-			$orderby          .= in_array( $order_field_type, array( 'number', 'scale', 'star' ) ) ? '+0' : '';
+			$orderby .= in_array( $order_field_type, array( 'number', 'scale', 'star' ) ) ? '+0' : '';
 		}
 
 		$order = self::get_param(
@@ -189,7 +189,7 @@ 
 
 		$r = "<tr id='item-action-{$item->id}'$style>";
 
-		list( $columns, $hidden, , $primary ) = $this->get_column_info();
+		list( $columns, $hidden,, $primary ) = $this->get_column_info();
 		$action_col                           = false;
 		$action_columns                       = $this->get_action_columns();
 

classes/models/FrmFormTemplateApi.php

Spacing +5 added lines, -5 removed lines

@@ -5,7 +5,7 @@ 
 
 class FrmFormTemplateApi extends FrmFormApi {
 
-	protected static $code_option_name  = 'frm_free_license_code';
+	protected static $code_option_name = 'frm_free_license_code';
 
 	private static $base_api_url = 'https://formidableforms.com/wp-json/form-templates/v1/';
 
@@ -76,7 +76,7 @@ 
 
 		$templates    = $this->get_api_info();
 		$contact_form = 20872734;
-		return isset( $templates[ $contact_form ] ) && ! empty( $templates[ $contact_form ]['url'] );
+		return isset( $templates[$contact_form] ) && ! empty( $templates[$contact_form]['url'] );
 	}
 
 	/**
@@ -137,15 +137,15 @@ 
 					continue;
 				}
 
-				$data['urlByKey'][ $template['key'] ] = $template['url'];
+				$data['urlByKey'][$template['key']] = $template['url'];
 			}
 
-			if ( ! isset( $data['urlByKey'][ $key ] ) ) {
+			if ( ! isset( $data['urlByKey'][$key] ) ) {
 				$error = new WP_Error( 400, 'We were unable to retrieve the template' );
 				wp_send_json_error( $error );
 			}
 
-			$data['url'] = $data['urlByKey'][ $key ];
+			$data['url'] = $data['urlByKey'][$key];
 		}
 
 		wp_send_json_success( $data );

classes/factories/FrmFieldFactory.php

Spacing +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
 			'name'     => 'FrmFieldName',
 		);
 
-		$class = isset( $type_classes[ $field_type ] ) ? $type_classes[ $field_type ] : '';
+		$class = isset( $type_classes[$field_type] ) ? $type_classes[$field_type] : '';
 
 		return apply_filters( 'frm_get_field_type_class', $class, $field_type );
 	}

classes/models/fields/FrmFieldCombo.php

Braces +2 added lines, -1 removed lines

@@ -39,7 +39,8 @@
 			}
 
 			foreach ( $sub_field['options'] as $option ) {
-				if ( 'default_value' === $option ) { // We parse default value from field column.
+				if ( 'default_value' === $option ) {
+// We parse default value from field column.
 					continue;
 				}
 

Spacing +12 added lines, -12 removed lines

@@ -59,12 +59,12 @@ 
 			if ( is_array( $sub_field ) ) {
 				$sub_field                 = wp_parse_args( $sub_field, $defaults );
 				$sub_field['name']         = $name;
-				$this->sub_fields[ $name ] = $sub_field;
+				$this->sub_fields[$name] = $sub_field;
 				continue;
 			}
 
 			if ( is_string( $sub_field ) ) {
-				$this->sub_fields[ $name ] = wp_parse_args(
+				$this->sub_fields[$name] = wp_parse_args(
 					array(
 						'name'  => $name,
 						'label' => $sub_field,
@@ -116,9 +116,9 @@ 
 				}
 
 				if ( is_string( $option ) ) {
-					$extra_options[ $key . '_' . $option ] = '';
+					$extra_options[$key . '_' . $option] = '';
 				} elseif ( ! empty( $option['name'] ) ) {
-					$extra_options[ $key . '_' . $option['name'] ] = '';
+					$extra_options[$key . '_' . $option['name']] = '';
 				}
 			}
 		}
@@ -141,7 +141,7 @@ 
 		foreach ( $this->sub_fields as $name => $sub_field ) {
 			$sub_field['name'] = $name;
 			$wrapper_classes   = 'frm_grid_container frm_sub_field_options frm_sub_field_options-' . $sub_field['name'];
-			if ( ! isset( $processed_sub_fields[ $name ] ) ) {
+			if ( ! isset( $processed_sub_fields[$name] ) ) {
 				// Options for this subfield should be hidden.
 				$wrapper_classes .= ' frm_hidden';
 			}
@@ -171,7 +171,7 @@ 
 			$default_value = array();
 
 			foreach ( $this->sub_fields as $name => $sub_field ) {
-				$default_value[ $name ] = '';
+				$default_value[$name] = '';
 			}
 
 			return $default_value;
@@ -343,8 +343,8 @@ 
 		// Placeholder.
 		if ( in_array( 'placeholder', $sub_field['options'], true ) ) {
 			$placeholders = FrmField::get_option( $field, 'placeholder' );
-			if ( ! empty( $placeholders[ $sub_field['name'] ] ) ) {
-				$field['placeholder'] = $placeholders[ $sub_field['name'] ];
+			if ( ! empty( $placeholders[$sub_field['name']] ) ) {
+				$field['placeholder'] = $placeholders[$sub_field['name']];
 			}
 		}
 
@@ -401,9 +401,9 @@ 
 
 		// Validate not empty.
 		foreach ( $sub_fields as $name => $sub_field ) {
-			if ( empty( $sub_field['optional'] ) && empty( $args['value'][ $name ] ) ) {
-				$errors[ 'field' . $args['id'] . '-' . $name ] = '';
-				$errors[ 'field' . $args['id'] ]               = $blank_msg;
+			if ( empty( $sub_field['optional'] ) && empty( $args['value'][$name] ) ) {
+				$errors['field' . $args['id'] . '-' . $name] = '';
+				$errors['field' . $args['id']]               = $blank_msg;
 			}
 		}
 
@@ -422,7 +422,7 @@ 
 		$field_key  = isset( $this->field->field_key ) ? $this->field->field_key : $this->field['field_key'];
 		$sub_fields = $this->get_processed_sub_fields();
 		foreach ( $sub_fields as $name => $sub_field ) {
-			$headings[ $field_id . '_' . $name ] = $field_name . ' (' . $field_key . ') - ' . $sub_field['label'];
+			$headings[$field_id . '_' . $name] = $field_name . ' (' . $field_key . ') - ' . $sub_field['label'];
 		}
 
 		return $headings;

classes/views/frm-fields/back-end/combo-field/sub-field-options.php

Spacing +5 added lines, -5 removed lines

@@ -51,13 +51,13 @@ 
 							type="text"
 							name="<?php echo esc_attr( $input_name ); ?>"
 							id="<?php echo esc_attr( $input_id ); ?>"
-							value="<?php echo esc_attr( isset( $default_value[ $sub_field['name'] ] ) ? $default_value[ $sub_field['name'] ] : '' ); ?>"
+							value="<?php echo esc_attr( isset( $default_value[$sub_field['name']] ) ? $default_value[$sub_field['name']] : '' ); ?>"
 							data-changeme="field_<?php echo esc_attr( $field_key . '_' . $sub_field['name'] ); ?>"
 							data-changeatt="value"
 						/>
 					</span>
 					<label class="frm_description" for="<?php echo esc_attr( $input_id ); ?>">
-						<?php echo esc_html( $labels[ $option ] ); ?>
+						<?php echo esc_html( $labels[$option] ); ?>
 					</label>
 				</p>
 				<?php
@@ -74,12 +74,12 @@ 
 						type="text"
 						name="<?php echo esc_attr( $input_name ); ?>"
 						id="<?php echo esc_attr( $input_id ); ?>"
-						value="<?php echo esc_attr( isset( $input_value[ $sub_field['name'] ] ) ? $input_value[ $sub_field['name'] ] : '' ); ?>"
+						value="<?php echo esc_attr( isset( $input_value[$sub_field['name']] ) ? $input_value[$sub_field['name']] : '' ); ?>"
 						data-changeme="field_<?php echo esc_attr( $field_key . '_' . $sub_field['name'] ); ?>"
 						data-changeatt="<?php echo esc_attr( $option ); ?>"
 					/>
 					<label class="frm_description" for="<?php echo esc_attr( $input_id ); ?>">
-						<?php echo esc_html( $labels[ $option ] ); ?>
+						<?php echo esc_html( $labels[$option] ); ?>
 					</label>
 				</p>
 				<?php
@@ -100,7 +100,7 @@ 
 						data-changeme="frm_field_<?php echo esc_attr( $field_id . '_' . $sub_field['name'] ); ?>_desc"
 					/>
 					<label class="frm_description" for="<?php echo esc_attr( $input_id ); ?>">
-						<?php echo esc_html( $labels[ $option ] ); ?>
+						<?php echo esc_html( $labels[$option] ); ?>
 					</label>
 				</p>
 				<?php

classes/helpers/FrmCSVExportHelper.php

Braces +2 added lines, -1 removed lines

@@ -122,7 +122,8 @@
 
 	private static function field_headings( $col ) {
 		$field_type_obj = FrmFieldFactory::get_field_factory( $col );
-		if ( ! empty( $field_type_obj->is_combo_field ) ) { // This is combo field.
+		if ( ! empty( $field_type_obj->is_combo_field ) ) {
+// This is combo field.
 			return $field_type_obj->get_export_headings();
 		}
 

Spacing +52 added lines, -52 removed lines

@@ -129,7 +129,7 @@ 
 
 		unset( $filename );
 
-		$comment_count       = FrmDb::get_count(
+		$comment_count = FrmDb::get_count(
 			'frm_item_metas',
 			array(
 				'item_id'         => $atts['entry_ids'],
@@ -224,7 +224,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,
@@ -247,10 +247,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,
@@ -270,14 +270,14 @@ 
 		foreach ( self::$fields as $col ) {
 			if ( self::is_the_child_of_a_repeater( $col ) ) {
 				$repeater_id                           = $col->field_options['in_section'];
-				$headings[ 'repeater' . $repeater_id ] = array(); // set a placeholder to maintain order for repeater fields
+				$headings['repeater' . $repeater_id] = array(); // set a placeholder to maintain order for repeater fields
 
-				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;
 			}
@@ -296,8 +296,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 );
@@ -308,17 +308,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;
 				}
 			}
 
@@ -332,9 +332,9 @@ 
 
 		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' );
+				$headings['comment' . $i]            = __( 'Comment', 'formidable' );
+				$headings['comment_user_id' . $i]    = __( 'Comment User', 'formidable' );
+				$headings['comment_created_at' . $i] = __( 'Comment Date', 'formidable' );
 			}
 			unset( $i );
 		}
@@ -379,7 +379,7 @@ 
 
 	private static function prepare_next_csv_rows( $next_set ) {
 		// order by parent_item_id so children will be first
-		$where   = array(
+		$where = array(
 			'or'             => 1,
 			'id'             => $next_set,
 			'parent_item_id' => $next_set,
@@ -425,32 +425,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;
 			}
 
 			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;
 		}
 
 		// 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;
 	}
 
 	/**
@@ -471,19 +471,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][] = '';
 			}
 		}
 
@@ -502,7 +502,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;
 
 			FrmAppHelper::unserialize_or_decode( $field_value );
 			self::add_array_values_to_columns( $row, compact( 'col', 'field_value' ) );
@@ -521,20 +521,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 );
 		}
@@ -557,7 +557,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,
 			)
 		);
 	}
@@ -572,8 +572,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;
 						}
 					}
 
@@ -581,8 +581,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;
 				}
 			}
 		}
@@ -607,18 +607,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 ++ );
 					$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 );