Strategy11 / formidable-forms

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/models/fields/FrmFieldType.php

Spacing +20 added lines, -20 removed lines

@@ -132,8 +132,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;
@@ -147,7 +147,7 @@ 
 		if ( is_object( $this->field ) ) {
 			$this->field->{$column} = $value;
 		} elseif ( is_array( $this->field ) ) {
-			$this->field[ $column ] = $value;
+			$this->field[$column] = $value;
 		}
 	}
 
@@ -469,7 +469,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'] )
 			);
 			?>
 			<i class="frm_icon_font frm_arrowdown6_icon"></i>
@@ -592,8 +592,8 @@ 
 		$fields = FrmField::field_selection();
 		$fields = array_merge( $fields, FrmField::pro_field_selection() );
 
-		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;
@@ -604,7 +604,7 @@ 
 	}
 
 	public function get_default_field_options() {
-		$opts       = array(
+		$opts = array(
 			'size'               => '',
 			'max'                => '',
 			'label'              => '',
@@ -942,7 +942,7 @@ 
 			}
 		} else {
 			$args['save_array'] = $this->is_readonly_array();
-			$hidden             .= $this->show_single_hidden( $selected_value, $args );
+			$hidden .= $this->show_single_hidden( $selected_value, $args );
 		}
 
 		return $hidden;
@@ -951,7 +951,7 @@ 
 	protected function show_single_hidden( $selected, $args ) {
 		if ( $args['save_array'] ) {
 			$args['field_name'] .= '[]';
-			$id                 = '';
+			$id = '';
 		} else {
 			$id = ' id="' . esc_attr( $args['html_id'] ) . '"';
 		}
@@ -967,8 +967,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 );
@@ -1019,7 +1019,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' => '',
@@ -1057,7 +1057,7 @@ 
 			$describedby = 'frm_desc_' . $args['html_id'];
 		}
 
-		if ( isset( $args['errors'][ 'field' . $args['field_id'] ] ) ) {
+		if ( isset( $args['errors']['field' . $args['field_id']] ) ) {
 			$describedby .= ' frm_error_' . $args['html_id'];
 		}
 
@@ -1116,11 +1116,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;
 	}
 
@@ -1145,7 +1145,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;
 	}
 
 	public function get_value_to_save( $value, $atts ) {
@@ -1177,8 +1177,8 @@ 
 		$value = $this->prepare_display_value( $value, $atts );
 
 		if ( is_array( $value ) ) {
-			if ( isset( $atts['show'] ) && $atts['show'] && isset( $value[ $atts['show'] ] ) ) {
-				$value = $value[ $atts['show'] ];
+			if ( isset( $atts['show'] ) && $atts['show'] && isset( $value[$atts['show']] ) ) {
+				$value = $value[$atts['show']];
 			} elseif ( ! isset( $atts['return_array'] ) || ! $atts['return_array'] ) {
 				$sep   = isset( $atts['sep'] ) ? $atts['sep'] : ', ';
 				$value = implode( $sep, $value );
@@ -1247,8 +1247,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/helpers/FrmFormsHelper.php

Spacing +22 added lines, -22 removed lines

@@ -28,7 +28,7 @@ 
 			'class'        => '',
 			'inc_children' => 'exclude',
 		);
-		$args     = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args( $args, $defaults );
 
 		if ( ! $args['field_id'] ) {
 			$args['field_id'] = $field_name;
@@ -70,7 +70,7 @@ 
 	 */
 	public static function add_html_attr( $class, $param, &$add_html ) {
 		if ( ! empty( $class ) ) {
-			$add_html[ $param ] = sanitize_title( $param ) . '="' . esc_attr( trim( sanitize_text_field( $class ) ) ) . '"';
+			$add_html[$param] = sanitize_title( $param ) . '="' . esc_attr( trim( sanitize_text_field( $class ) ) ) . '"';
 		}
 	}
 
@@ -276,8 +276,8 @@ 
 			'description' => '',
 		);
 		foreach ( $defaults as $var => $default ) {
-			if ( ! isset( $values[ $var ] ) ) {
-				$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
+			if ( ! isset( $values[$var] ) ) {
+				$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
 			}
 		}
 
@@ -292,8 +292,8 @@ 
 			'parent_form_id' => 0,
 		);
 		foreach ( $defaults as $var => $default ) {
-			if ( ! isset( $values[ $var ] ) ) {
-				$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
+			if ( ! isset( $values[$var] ) ) {
+				$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
 			}
 		}
 		unset( $defaults );
@@ -330,16 +330,16 @@ 
 		$defaults = self::get_default_opts();
 		foreach ( $defaults as $var => $default ) {
 			if ( is_array( $default ) ) {
-				if ( ! isset( $values[ $var ] ) ) {
-					$values[ $var ] = ( $record && isset( $record->options[ $var ] ) ) ? $record->options[ $var ] : array();
+				if ( ! isset( $values[$var] ) ) {
+					$values[$var] = ( $record && isset( $record->options[$var] ) ) ? $record->options[$var] : array();
 				}
 
 				foreach ( $default as $k => $v ) {
-					$values[ $var ][ $k ] = ( $post_values && isset( $post_values[ $var ][ $k ] ) ) ? $post_values[ $var ][ $k ] : ( ( $record && isset( $record->options[ $var ] ) && isset( $record->options[ $var ][ $k ] ) ) ? $record->options[ $var ][ $k ] : $v );
+					$values[$var][$k] = ( $post_values && isset( $post_values[$var][$k] ) ) ? $post_values[$var][$k] : ( ( $record && isset( $record->options[$var] ) && isset( $record->options[$var][$k] ) ) ? $record->options[$var][$k] : $v );
 
 					if ( is_array( $v ) ) {
 						foreach ( $v as $k1 => $v1 ) {
-							$values[ $var ][ $k ][ $k1 ] = ( $post_values && isset( $post_values[ $var ][ $k ][ $k1 ] ) ) ? $post_values[ $var ][ $k ][ $k1 ] : ( ( $record && isset( $record->options[ $var ] ) && isset( $record->options[ $var ][ $k ] ) && isset( $record->options[ $var ][ $k ][ $k1 ] ) ) ? $record->options[ $var ][ $k ][ $k1 ] : $v1 );
+							$values[$var][$k][$k1] = ( $post_values && isset( $post_values[$var][$k][$k1] ) ) ? $post_values[$var][$k][$k1] : ( ( $record && isset( $record->options[$var] ) && isset( $record->options[$var][$k] ) && isset( $record->options[$var][$k][$k1] ) ) ? $record->options[$var][$k][$k1] : $v1 );
 							unset( $k1, $v1 );
 						}
 					}
@@ -347,7 +347,7 @@ 
 					unset( $k, $v );
 				}
 			} else {
-				$values[ $var ] = ( $post_values && isset( $post_values['options'][ $var ] ) ) ? $post_values['options'][ $var ] : ( ( $record && isset( $record->options[ $var ] ) ) ? $record->options[ $var ] : $default );
+				$values[$var] = ( $post_values && isset( $post_values['options'][$var] ) ) ? $post_values['options'][$var] : ( ( $record && isset( $record->options[$var] ) ) ? $record->options[$var] : $default );
 			}
 
 			unset( $var, $default );
@@ -385,7 +385,7 @@ 
 	public static function fill_form_options( &$options, $values ) {
 		$defaults = self::get_default_opts();
 		foreach ( $defaults as $var => $default ) {
-			$options[ $var ] = isset( $values['options'][ $var ] ) ? $values['options'][ $var ] : $default;
+			$options[$var] = isset( $values['options'][$var] ) ? $values['options'][$var] : $default;
 			unset( $var, $default );
 		}
 	}
@@ -541,7 +541,7 @@ 
 	public static function insert_opt_html( $args ) {
 		$class  = isset( $args['class'] ) ? $args['class'] : '';
 		$fields = FrmField::all_field_selection();
-		$field  = isset( $fields[ $args['type'] ] ) ? $fields[ $args['type'] ] : array();
+		$field  = isset( $fields[$args['type']] ) ? $fields[$args['type']] : array();
 
 		self::prepare_field_type( $field );
 
@@ -693,7 +693,7 @@ 
 			FrmField::update( $field->id, array( 'field_order' => $field->field_order + 2 ) );
 		}
 
-		$add_order    += 2;
+		$add_order += 2;
 		$open         = false;
 		$reset_fields = true;
 	}
@@ -1045,10 +1045,10 @@ 
 				$link .= ' onclick="return confirm(\'' . esc_attr( $link_details['confirm'] ) . '\')"';
 			}
 
-			$label = ( isset( $link_details[ $length ] ) ? $link_details[ $length ] : $link_details['label'] );
-			if ( $length == 'icon' && isset( $link_details[ $length ] ) ) {
+			$label = ( isset( $link_details[$length] ) ? $link_details[$length] : $link_details['label'] );
+			if ( $length == 'icon' && isset( $link_details[$length] ) ) {
 				$label = '<span class="' . $label . '" title="' . esc_attr( $link_details['label'] ) . '" aria-hidden="true"></span>';
-				$link  .= ' aria-label="' . esc_attr( $link_details['label'] ) . '"';
+				$link .= ' aria-label="' . esc_attr( $link_details['label'] ) . '"';
 			}
 
 			$link .= '>' . $label . '</a>';
@@ -1204,7 +1204,7 @@ 
 			$status = 'publish';
 		}
 
-		$name = $nice_names[ $status ];
+		$name = $nice_names[$status];
 
 		return $name;
 	}
@@ -1237,17 +1237,17 @@ 
 			''                    => array( 'align_right' ),
 		);
 
-		$icons[ __( 'My Templates', 'formidable' ) ] = array( 'user', 'var(--orange)' );
+		$icons[__( 'My Templates', 'formidable' )] = array( 'user', 'var(--orange)' );
 
 		$icon = $icons[''];
 
 		if ( count( $categories ) === 1 ) {
 			$category = reset( $categories );
-			$icon     = isset( $icons[ $category ] ) ? $icons[ $category ] : $icon;
+			$icon     = isset( $icons[$category] ) ? $icons[$category] : $icon;
 		} elseif ( ! empty( $categories ) ) {
 			foreach ( $icons as $cat => $icon ) {
 				if ( ! in_array( $cat, $categories ) ) {
-					unset( $icons[ $cat ] );
+					unset( $icons[$cat] );
 				}
 			}
 			$icon = reset( $icons );
@@ -1373,7 +1373,7 @@ 
 
 		foreach ( $item['categories'] as $k => $category ) {
 			if ( in_array( $category, $plans, true ) ) {
-				unset( $item['categories'][ $k ] );
+				unset( $item['categories'][$k] );
 
 				if ( $category === 'Personal' ) {
 					// Show the current package name.

classes/controllers/FrmAddonsController.php

Spacing +13 added lines, -13 removed lines

@@ -74,7 +74,7 @@ 
 		} else {
 			foreach ( $addons as $k => $addon ) {
 				if ( empty( $addon['excerpt'] ) && $k !== 'error' ) {
-					unset( $addons[ $k ] );
+					unset( $addons[$k] );
 				}
 			}
 		}
@@ -170,7 +170,7 @@ 
 
 		foreach ( $list as $k => $info ) {
 			$info['slug'] = $k;
-			$list[ $k ]   = array_merge( $defaults, $info );
+			$list[$k]   = array_merge( $defaults, $info );
 		}
 		return $list;
 	}
@@ -349,16 +349,16 @@ 
 				continue;
 			}
 
-			$wp_plugin  = isset( $wp_plugins[ $folder ] ) ? $wp_plugins[ $folder ] : array();
+			$wp_plugin  = isset( $wp_plugins[$folder] ) ? $wp_plugins[$folder] : array();
 			$wp_version = isset( $wp_plugin['Version'] ) ? $wp_plugin['Version'] : '1.0';
 
 			if ( version_compare( $wp_version, $plugin->new_version, '<' ) ) {
 				$slug                           = explode( '/', $folder );
 				$plugin->slug                   = $slug[0];
-				$transient->response[ $folder ] = $plugin;
+				$transient->response[$folder] = $plugin;
 			}
 
-			$transient->checked[ $folder ] = $wp_version;
+			$transient->checked[$folder] = $wp_version;
 
 		}
 
@@ -381,7 +381,7 @@ 
 
 		$all_plugins = get_plugins();
 
-		return isset( $all_plugins[ $plugin ] );
+		return isset( $all_plugins[$plugin] );
 	}
 
 	/**
@@ -420,13 +420,13 @@ 
 			}
 
 			$download_id = isset( $plugin['id'] ) ? $plugin['id'] : 0;
-			if ( ! empty( $download_id ) && ! isset( $version_info[ $download_id ]['package'] ) ) {
+			if ( ! empty( $download_id ) && ! isset( $version_info[$download_id]['package'] ) ) {
 				// if this addon is using its own license, get the update url
 				$addon_info = $api->get_api_info();
 
-				$version_info[ $download_id ] = $addon_info[ $download_id ];
+				$version_info[$download_id] = $addon_info[$download_id];
 				if ( isset( $addon_info['error'] ) ) {
-					$version_info[ $download_id ]['error'] = array(
+					$version_info[$download_id]['error'] = array(
 						'message' => $addon_info['error']['message'],
 						'code'    => $addon_info['error']['code'],
 					);
@@ -520,8 +520,8 @@ 
 					return $addon;
 				}
 			}
-		} elseif ( isset( $addons[ $download_id ] ) ) {
-			$plugin = $addons[ $download_id ];
+		} elseif ( isset( $addons[$download_id] ) ) {
+			$plugin = $addons[$download_id];
 		}
 
 		return $plugin;
@@ -575,7 +575,7 @@ 
 			self::prepare_addon_link( $addon['link'] );
 
 			self::set_addon_status( $addon );
-			$addons[ $id ] = $addon;
+			$addons[$id] = $addon;
 		}
 	}
 
@@ -593,7 +593,7 @@ 
 			'utm_medium'   => 'addons',
 			'utm_campaign' => 'liteplugin',
 		);
-		$link       = add_query_arg( $query_args, $link );
+		$link = add_query_arg( $query_args, $link );
 	}
 
 	/**

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/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 } ?>