Strategy11 / formidable-forms

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

Spacing +4 added lines, -4 removed lines

@@ -40,7 +40,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,7 +60,7 @@ 
 						<input
 							type="<?php echo esc_attr( $sub_field['type'] ); ?>"
 							id="<?php echo esc_attr( $html_id . '_' . $name ); ?>"
-							value="<?php echo esc_attr( isset( $field_value[ $name ] ) ? $field_value[ $name ] : '' ); ?>"
+							value="<?php echo esc_attr( isset( $field_value[$name] ) ? $field_value[$name] : '' ); ?>"
 							<?php
 							if ( empty( $args['remove_names'] ) ) {
 								echo 'name="' . esc_attr( $field_name ) . '[' . esc_attr( $name ) . ']" ';
@@ -77,9 +77,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"><?php echo esc_html( $errors[ 'field' . $field_id . '-' . $name ] ); ?></div>
+					<div class="frm_error"><?php echo esc_html( $errors['field' . $field_id . '-' . $name] ); ?></div>
 				<?php } ?>
 			</div>
 		<?php } ?>

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 +50 added lines, -50 removed lines

@@ -41,7 +41,7 @@ 
 		self::print_file_headers( $filename );
 		unset( $filename );
 
-		$comment_count       = FrmDb::get_count(
+		$comment_count = FrmDb::get_count(
 			'frm_item_metas',
 			array(
 				'item_id'         => $atts['entry_ids'],
@@ -107,7 +107,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,
@@ -129,10 +129,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,
@@ -151,14 +151,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;
 			}
@@ -177,8 +177,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 );
@@ -189,17 +189,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;
 				}
 			}
 
@@ -213,9 +213,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 );
 		}
@@ -258,7 +258,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,
@@ -303,32 +303,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;
 	}
 
 	/**
@@ -349,14 +349,14 @@ 
 		}
 
 		$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 ]                                            = '';
-				$entries[ self::$entry->parent_item_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]                                            = '';
+				$entries[self::$entry->parent_item_id]->metas[$repeater_child->id][] = '';
 			}
 		}
 
@@ -375,7 +375,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' ) );
@@ -393,17 +393,17 @@ 
 			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();
 					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 );
 		}
@@ -426,7 +426,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,
 			)
 		);
 	}
@@ -441,8 +441,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;
 						}
 					}
 
@@ -450,8 +450,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;
 				}
 			}
 		}
@@ -475,18 +475,18 @@ 
 		$sep = '';
 
 		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 );

classes/models/FrmAntiSpam.php

Spacing +2 added lines, -2 removed lines

@@ -213,10 +213,10 @@
 			return false;
 		}
 		$form_params = $frm_vars['form_params'];
-		if ( ! isset( $form_params[ $this->form_id ] ) ) {
+		if ( ! isset( $form_params[$this->form_id] ) ) {
 			return false;
 		}
-		$this_form_params = $form_params[ $this->form_id ];
+		$this_form_params = $form_params[$this->form_id];
 		return ! empty( $this_form_params['action'] ) && 'update' === $this_form_params['action'];
 	}
 

classes/models/FrmHoneypot.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 	private function check_honeypot_setting() {
 		$form = $this->get_form();
 		$key  = $this->get_option_key();
-		return $form->options[ $key ];
+		return $form->options[$key];
 	}
 
 	/**

classes/models/FrmValidate.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 	protected function is_option_on() {
 		$form = $this->get_form();
 		$key  = $this->get_option_key();
-		return ! empty( $form->options[ $key ] ) && 'off' !== $form->options[ $key ];
+		return ! empty( $form->options[$key] ) && 'off' !== $form->options[$key];
 	}
 
 	/**

classes/models/fields/FrmFieldName.php

Spacing +10 added lines, -10 removed lines

@@ -46,19 +46,19 @@ 
 		$result = array();
 
 		foreach ( $names as $name ) {
-			if ( empty( $this->sub_fields[ $name ] ) ) {
+			if ( empty( $this->sub_fields[$name] ) ) {
 				continue;
 			}
 
-			if ( ! isset( $this->sub_fields[ $name ]['wrapper_classes'] ) ) {
-				$this->sub_fields[ $name ]['wrapper_classes'] = $col_class;
-			} elseif ( is_array( $this->sub_fields[ $name ]['wrapper_classes'] ) ) {
-				$this->sub_fields[ $name ]['wrapper_classes'] = implode( ' ', $this->sub_fields[ $name ]['wrapper_classes'] ) . ' ' . $col_class;
+			if ( ! isset( $this->sub_fields[$name]['wrapper_classes'] ) ) {
+				$this->sub_fields[$name]['wrapper_classes'] = $col_class;
+			} elseif ( is_array( $this->sub_fields[$name]['wrapper_classes'] ) ) {
+				$this->sub_fields[$name]['wrapper_classes'] = implode( ' ', $this->sub_fields[$name]['wrapper_classes'] ) . ' ' . $col_class;
 			} else {
-				$this->sub_fields[ $name ]['wrapper_classes'] .= ' ' . $col_class;
+				$this->sub_fields[$name]['wrapper_classes'] .= ' ' . $col_class;
 			}
 
-			$result[ $name ] = $this->sub_fields[ $name ];
+			$result[$name] = $this->sub_fields[$name];
 		}
 
 		return $result;
@@ -89,7 +89,7 @@ 
 
 		// Default desc.
 		foreach ( $this->sub_fields as $name => $sub_field ) {
-			$extra_options[ $name . '_desc' ] = $sub_field['label'];
+			$extra_options[$name . '_desc'] = $sub_field['label'];
 		}
 
 		return $extra_options;
@@ -125,7 +125,7 @@ 
 		$name_layout = $this->get_name_layout();
 
 		if ( ! empty( $atts['show'] ) ) {
-			return isset( $value[ $atts['show'] ] ) ? $value[ $atts['show'] ] : '';
+			return isset( $value[$atts['show']] ) ? $value[$atts['show']] : '';
 		}
 
 		$value = wp_parse_args(
@@ -198,7 +198,7 @@ 
 			$args['sub_fields'] = $this->sub_fields;
 
 			foreach ( $hidden_fields as $name => $hidden_field ) {
-				$args['sub_fields'][ $name ]['wrapper_classes'] .= ' frm_hidden';
+				$args['sub_fields'][$name]['wrapper_classes'] .= ' frm_hidden';
 			}
 		}
 	}

classes/views/frm-forms/form.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 			$grid_helper     = new FrmFieldGridHelper();
 			$values['count'] = 0;
 			foreach ( $values['fields'] as $field ) {
-				$values['count']++;
+				$values['count'] ++;
 				$grid_helper->set_field( $field );
 				$grid_helper->maybe_begin_field_wrapper();
 				FrmFieldsController::load_single_field( $field, $values );

classes/helpers/FrmFieldsHelper.php

Spacing +44 added lines, -44 removed lines

@@ -26,7 +26,7 @@ 
 			if ( in_array( $type, array( 'data', 'lookup' ) ) ) {
 				$values['field_options']['data_type'] = $setting;
 			} else {
-				$values['field_options'][ $setting ] = 1;
+				$values['field_options'][$setting] = 1;
 			}
 		}
 
@@ -133,10 +133,10 @@ 
 		}
 
 		foreach ( $defaults as $opt => $default ) {
-			$values[ $opt ] = isset( $field->field_options[ $opt ] ) ? $field->field_options[ $opt ] : $default;
+			$values[$opt] = isset( $field->field_options[$opt] ) ? $field->field_options[$opt] : $default;
 
 			if ( $check_post ) {
-				self::get_posted_field_setting( $opt . '_' . $field->id, $values[ $opt ] );
+				self::get_posted_field_setting( $opt . '_' . $field->id, $values[$opt] );
 			}
 
 			unset( $opt, $default );
@@ -180,20 +180,20 @@ 
 	 * @param mixed $value
 	 */
 	private static function get_posted_field_setting( $setting, &$value ) {
-		if ( ! isset( $_POST['field_options'][ $setting ] ) ) {
+		if ( ! isset( $_POST['field_options'][$setting] ) ) {
 			return;
 		}
 
 		if ( strpos( $setting, 'html' ) !== false ) {
 			// Strip slashes from HTML but not regex or script tags.
 			// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
-			$value = wp_unslash( $_POST['field_options'][ $setting ] );
+			$value = wp_unslash( $_POST['field_options'][$setting] );
 		} elseif ( strpos( $setting, 'format_' ) === 0 ) {
 			// TODO: Remove stripslashes on output, and use on input only.
-			$value = sanitize_text_field( $_POST['field_options'][ $setting ] ); // WPCS: sanitization ok.
+			$value = sanitize_text_field( $_POST['field_options'][$setting] ); // WPCS: sanitization ok.
 		} else {
 			// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
-			$value = wp_unslash( $_POST['field_options'][ $setting ] );
+			$value = wp_unslash( $_POST['field_options'][$setting] );
 			FrmAppHelper::sanitize_value( 'wp_kses_post', $value );
 		}
 	}
@@ -266,7 +266,7 @@ 
 		$values['default_value'] = FrmAppHelper::maybe_json_encode( $field->default_value );
 
 		foreach ( array( 'name', 'description', 'type', 'field_order', 'field_options', 'required' ) as $col ) {
-			$values[ $col ] = $field->{$col};
+			$values[$col] = $field->{$col};
 		}
 	}
 
@@ -306,7 +306,7 @@ 
 		);
 
 		$msg = FrmField::get_option( $field, $error );
-		$msg = empty( $msg ) ? $defaults[ $error ]['part'] : $msg;
+		$msg = empty( $msg ) ? $defaults[$error]['part'] : $msg;
 		$msg = do_shortcode( $msg );
 
 		return $msg;
@@ -416,7 +416,7 @@ 
 		}
 
 		$base_name = 'default_value_' . $field['id'];
-		$html_id    = isset( $field['html_id'] ) ? $field['html_id'] : self::get_html_id( $field );
+		$html_id = isset( $field['html_id'] ) ? $field['html_id'] : self::get_html_id( $field );
 
 		$default_type = self::get_default_value_type( $field );
 
@@ -714,7 +714,7 @@ 
 				continue;
 			}
 
-			$atts = FrmShortcodeHelper::get_shortcode_attribute_array( $shortcodes[3][ $short_key ] );
+			$atts = FrmShortcodeHelper::get_shortcode_attribute_array( $shortcodes[3][$short_key] );
 			$tag  = FrmShortcodeHelper::get_shortcode_tag( $shortcodes, $short_key );
 
 			$atts['entry'] = $entry;
@@ -723,7 +723,7 @@ 
 
 			if ( $replace_with !== null ) {
 				self::sanitize_embedded_shortcodes( compact( 'entry' ), $replace_with );
-				$content = str_replace( $shortcodes[0][ $short_key ], $replace_with, $content );
+				$content = str_replace( $shortcodes[0][$short_key], $replace_with, $content );
 			}
 
 			unset( $atts, $replace_with );
@@ -766,8 +766,8 @@ 
 
 		$dynamic_default = array( 'admin_email', 'siteurl', 'frmurl', 'sitename', 'get' );
 
-		if ( isset( $shortcode_values[ $atts['tag'] ] ) ) {
-			$replace_with = $shortcode_values[ $atts['tag'] ];
+		if ( isset( $shortcode_values[$atts['tag']] ) ) {
+			$replace_with = $shortcode_values[$atts['tag']];
 		} elseif ( in_array( $atts['tag'], $dynamic_default ) ) {
 			$replace_with = self::dynamic_default_values( $atts['tag'], $atts );
 		} elseif ( $clean_tag == 'user_agent' ) {
@@ -978,8 +978,8 @@ 
 			self::field_types_for_input( $single_input, $field_selection, $field_types );
 		} elseif ( in_array( $type, $multiple_input ) ) {
 			self::field_types_for_input( $multiple_input, $field_selection, $field_types );
-		} elseif ( isset( $field_selection[ $type ] ) ) {
-			$field_types[ $type ] = $field_selection[ $type ];
+		} elseif ( isset( $field_selection[$type] ) ) {
+			$field_types[$type] = $field_selection[$type];
 		}
 
 		$field_types = apply_filters( 'frm_switch_field_types', $field_types, compact( 'type', 'field_selection' ) );
@@ -1012,7 +1012,7 @@ 
 
 	private static function field_types_for_input( $inputs, $fields, &$field_types ) {
 		foreach ( $inputs as $input ) {
-			$field_types[ $input ] = $fields[ $input ];
+			$field_types[$input] = $fields[$input];
 			unset( $input );
 		}
 	}
@@ -1044,7 +1044,7 @@ 
 			'parent'  => false,
 			'pointer' => false,
 		);
-		$args     = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args( $args, $defaults );
 
 		$opt_key   = $args['opt_key'];
 		$field     = $args['field'];
@@ -1060,22 +1060,22 @@ 
 
 		// Check posted vals before checking saved values
 		// For fields inside repeating sections - note, don't check if $pointer is true because it will often be zero
-		if ( $parent && isset( $_POST['item_meta'][ $parent ][ $pointer ]['other'][ $field['id'] ] ) ) {
+		if ( $parent && isset( $_POST['item_meta'][$parent][$pointer]['other'][$field['id']] ) ) {
 			if ( FrmField::is_field_with_multiple_values( $field ) ) {
-				$other_val = isset( $_POST['item_meta'][ $parent ][ $pointer ]['other'][ $field['id'] ][ $opt_key ] ) ? sanitize_text_field( wp_unslash( $_POST['item_meta'][ $parent ][ $pointer ]['other'][ $field['id'] ][ $opt_key ] ) ) : '';
+				$other_val = isset( $_POST['item_meta'][$parent][$pointer]['other'][$field['id']][$opt_key] ) ? sanitize_text_field( wp_unslash( $_POST['item_meta'][$parent][$pointer]['other'][$field['id']][$opt_key] ) ) : '';
 			} else {
-				$other_val = sanitize_text_field( wp_unslash( $_POST['item_meta'][ $parent ][ $pointer ]['other'][ $field['id'] ] ) );
+				$other_val = sanitize_text_field( wp_unslash( $_POST['item_meta'][$parent][$pointer]['other'][$field['id']] ) );
 			}
 
 			return $other_val;
 
-		} elseif ( isset( $field['id'] ) && isset( $_POST['item_meta']['other'][ $field['id'] ] ) ) {
+		} elseif ( isset( $field['id'] ) && isset( $_POST['item_meta']['other'][$field['id']] ) ) {
 			// For normal fields
 
 			if ( FrmField::is_field_with_multiple_values( $field ) ) {
-				$other_val = isset( $_POST['item_meta']['other'][ $field['id'] ][ $opt_key ] ) ? sanitize_text_field( wp_unslash( $_POST['item_meta']['other'][ $field['id'] ][ $opt_key ] ) ) : '';
+				$other_val = isset( $_POST['item_meta']['other'][$field['id']][$opt_key] ) ? sanitize_text_field( wp_unslash( $_POST['item_meta']['other'][$field['id']][$opt_key] ) ) : '';
 			} else {
-				$other_val = sanitize_text_field( wp_unslash( $_POST['item_meta']['other'][ $field['id'] ] ) );
+				$other_val = sanitize_text_field( wp_unslash( $_POST['item_meta']['other'][$field['id']] ) );
 			}
 
 			return $other_val;
@@ -1085,8 +1085,8 @@ 
 		if ( $field['type'] == 'checkbox' && is_array( $field['value'] ) ) {
 			// Check if there is an "other" val in saved value and make sure the
 			// "other" val is not equal to the Other checkbox option
-			if ( isset( $field['value'][ $opt_key ] ) && $field['options'][ $opt_key ] != $field['value'][ $opt_key ] ) {
-				$other_val = $field['value'][ $opt_key ];
+			if ( isset( $field['value'][$opt_key] ) && $field['options'][$opt_key] != $field['value'][$opt_key] ) {
+				$other_val = $field['value'][$opt_key];
 			}
 		} else {
 			/**
@@ -1098,8 +1098,8 @@ 
 				// Multi-select dropdowns - key is not preserved
 				if ( is_array( $field['value'] ) ) {
 					$o_key = array_search( $temp_val, $field['value'] );
-					if ( isset( $field['value'][ $o_key ] ) ) {
-						unset( $field['value'][ $o_key ], $o_key );
+					if ( isset( $field['value'][$o_key] ) ) {
+						unset( $field['value'][$o_key], $o_key );
 					}
 				} elseif ( $temp_val == $field['value'] ) {
 					// For radio and regular dropdowns
@@ -1141,7 +1141,7 @@ 
 			return $other_args;
 		}
 
-		$other_opt  = true;
+		$other_opt = true;
 
 		self::set_other_name( $args, $other_args );
 		self::set_other_value( $args, $other_args );
@@ -1291,7 +1291,7 @@ 
 		if ( is_array( $val ) ) {
 			foreach ( $val as $k => $v ) {
 				if ( is_string( $v ) ) {
-					$val[ $k ] = str_replace( $replace, $replace_with, $v );
+					$val[$k] = str_replace( $replace, $replace_with, $v );
 					unset( $k, $v );
 				}
 			}
@@ -1644,7 +1644,7 @@ 
 			$countries['class'] = 'frm-countries-opts';
 		}
 
-		$prepop[ __( 'Countries', 'formidable' ) ] = $countries;
+		$prepop[__( 'Countries', 'formidable' )] = $countries;
 
 		// State abv.
 		$states    = self::get_us_states();
@@ -1654,7 +1654,7 @@ 
 			$state_abv['class'] = 'frm-state-abv-opts';
 		}
 
-		$prepop[ __( 'U.S. State Abbreviations', 'formidable' ) ] = $state_abv;
+		$prepop[__( 'U.S. State Abbreviations', 'formidable' )] = $state_abv;
 
 		// States.
 		$states = array_values( $states );
@@ -1663,7 +1663,7 @@ 
 			$states['class'] = 'frm-states-opts';
 		}
 
-		$prepop[ __( 'U.S. States', 'formidable' ) ] = $states;
+		$prepop[__( 'U.S. States', 'formidable' )] = $states;
 		unset( $state_abv, $states );
 
 		// Age.
@@ -1681,7 +1681,7 @@ 
 			$ages['class'] = 'frm-age-opts';
 		}
 
-		$prepop[ __( 'Age', 'formidable' ) ] = $ages;
+		$prepop[__( 'Age', 'formidable' )] = $ages;
 
 		// Satisfaction.
 		$satisfaction = array(
@@ -1696,7 +1696,7 @@ 
 			$satisfaction['class'] = 'frm-satisfaction-opts';
 		}
 
-		$prepop[ __( 'Satisfaction', 'formidable' ) ] = $satisfaction;
+		$prepop[__( 'Satisfaction', 'formidable' )] = $satisfaction;
 
 		// Importance.
 		$importance = array(
@@ -1711,7 +1711,7 @@ 
 			$importance['class'] = 'frm-importance-opts';
 		}
 
-		$prepop[ __( 'Importance', 'formidable' ) ] = $importance;
+		$prepop[__( 'Importance', 'formidable' )] = $importance;
 
 		// Agreement.
 		$agreement = array(
@@ -1726,7 +1726,7 @@ 
 			$agreement['class'] = 'frm-agreement-opts';
 		}
 
-		$prepop[ __( 'Agreement', 'formidable' ) ] = $agreement;
+		$prepop[__( 'Agreement', 'formidable' )] = $agreement;
 
 		// Likely.
 		$likely = array(
@@ -1741,7 +1741,7 @@ 
 			$likely['class'] = 'frm-likely-opts';
 		}
 
-		$prepop[ __( 'Likely', 'formidable' ) ] = $likely;
+		$prepop[__( 'Likely', 'formidable' )] = $likely;
 
 		$prepop = apply_filters( 'frm_bulk_field_choices', $prepop );
 	}
@@ -1916,16 +1916,16 @@ 
 	 */
 	private static function fill_image_setting_options( $options, &$args ) {
 		foreach ( $options as $key => $option ) {
-			$args['options'][ $key ] = $option;
+			$args['options'][$key] = $option;
 
 			if ( ! empty( $option['addon'] ) ) {
-				$args['options'][ $key ]['custom_attrs'] = self::fill_image_setting_addon_link( $option );
+				$args['options'][$key]['custom_attrs'] = self::fill_image_setting_addon_link( $option );
 			}
 
-			unset( $args['options'][ $key ]['addon'] );
+			unset( $args['options'][$key]['addon'] );
 			$fill = array( 'upgrade', 'message', 'content' );
 			foreach ( $fill as $f ) {
-				unset( $args['options'][ $key ][ $f ], $f );
+				unset( $args['options'][$key][$f], $f );
 			}
 		}
 	}
@@ -1946,8 +1946,8 @@ 
 
 		$fill = array( 'upgrade', 'message', 'content' );
 		foreach ( $fill as $f ) {
-			if ( isset( $option[ $f ] ) ) {
-				$custom_attrs[ 'data-' . $f ] = $option[ $f ];
+			if ( isset( $option[$f] ) ) {
+				$custom_attrs['data-' . $f] = $option[$f];
 			}
 		}