Strategy11 / formidable-forms

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

@@ -123,7 +123,7 @@ 
 
 		unset( $filename );
 
-		$comment_count       = FrmDb::get_count(
+		$comment_count = FrmDb::get_count(
 			'frm_item_metas',
 			array(
 				'item_id'         => $atts['entry_ids'],
@@ -206,7 +206,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,
@@ -229,10 +229,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,
@@ -252,14 +252,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;
 			}
@@ -278,8 +278,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 );
@@ -290,17 +290,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;
 				}
 			}
 
@@ -314,9 +314,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 );
 		}
@@ -361,7 +361,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,
@@ -407,32 +407,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;
 	}
 
 	/**
@@ -453,14 +453,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][] = '';
 			}
 		}
 
@@ -479,7 +479,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' ) );
@@ -498,17 +498,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 );
 		}
@@ -531,7 +531,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,
 			)
 		);
 	}
@@ -546,8 +546,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;
 						}
 					}
 
@@ -555,8 +555,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;
 				}
 			}
 		}
@@ -581,18 +581,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 );

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

Spacing +7 added lines, -7 removed lines

@@ -75,16 +75,16 @@ 
 			'name'                => sprintf(
 				/* translators: Formidable addon name */
 				esc_html_x( 'Formidable %s', 'Formidable Addon Name', 'formidable' ),
-				$addon_list[ $matching_addon ]['name']
+				$addon_list[$matching_addon]['name']
 			),
-			'addon'               => $addon_list[ $matching_addon ]['slug'],
-			'short_description'   => $addon_list[ $matching_addon ]['excerpt'],
+			'addon'               => $addon_list[$matching_addon]['slug'],
+			'short_description'   => $addon_list[$matching_addon]['excerpt'],
 			'slug'                => self::$slug,
-			'version'             => $addon_list[ $matching_addon ]['version'],
+			'version'             => $addon_list[$matching_addon]['version'],
 		);
 
 		// Splice in the base addon data.
-		$inject = array_merge( $inject, $addon_list[ $matching_addon ], $overrides );
+		$inject = array_merge( $inject, $addon_list[$matching_addon], $overrides );
 
 		// Add it to the top of the list.
 		array_unshift( $result->plugins, $inject );
@@ -136,7 +136,7 @@ 
 	 * @return array
 	 */
 	private function get_addons() {
-		$api    = new FrmFormApi();
+		$api = new FrmFormApi();
 		return $api->get_api_info();
 	}
 
@@ -341,7 +341,7 @@ 
 
 		$all_plugins = get_plugins();
 
-		return isset( $all_plugins[ $plugin ] );
+		return isset( $all_plugins[$plugin] );
 	}
 
 	/**

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/widgets/FrmElementorWidget.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 
 			foreach ( $forms as $form ) {
 				$form_title           = '' === $form->name ? __( '(no title)', 'formidable' ) : FrmAppHelper::truncate( $form->name, 50 );
-				$options[ $form->id ] = esc_html( $form_title );
+				$options[$form->id] = esc_html( $form_title );
 			}
 
 			return $options;

classes/controllers/FrmFieldsController.php

Spacing +23 added lines, -23 removed lines

@@ -18,7 +18,7 @@ 
 
 		$_GET['page'] = 'formidable';
 
-		$values     = array(
+		$values = array(
 			'id'         => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ),
 			'doing_ajax' => true,
 		);
@@ -41,7 +41,7 @@ 
 
 			ob_start();
 			self::load_single_field( $field, $values );
-			$field_html[ absint( $field->id ) ] = ob_get_contents();
+			$field_html[absint( $field->id )] = ob_get_contents();
 			ob_end_clean();
 		}
 
@@ -256,7 +256,7 @@ 
 			foreach ( $opts as $opt_key => $opt ) {
 				if ( strpos( $opt, '|' ) !== false ) {
 					$vals = explode( '|', $opt );
-					$opts[ $opt_key ] = array(
+					$opts[$opt_key] = array(
 						'label' => trim( $vals[0] ),
 						'value' => trim( $vals[1] ),
 					);
@@ -271,7 +271,7 @@ 
 			$other_array = array();
 			foreach ( $field['options'] as $opt_key => $opt ) {
 				if ( FrmFieldsHelper::is_other_opt( $opt_key ) ) {
-					$other_array[ $opt_key ] = $opt;
+					$other_array[$opt_key] = $opt;
 				}
 				unset( $opt_key, $opt );
 			}
@@ -313,18 +313,18 @@ 
 		$disabled_fields     = FrmAppHelper::pro_is_installed() ? array() : $pro_field_selection;
 		$frm_settings        = FrmAppHelper::get_settings();
 
-		if ( ! isset( $all_field_types[ $field['type'] ] ) ) {
+		if ( ! isset( $all_field_types[$field['type']] ) ) {
 			// Add fallback for an add-on field type that has been deactivated.
-			$all_field_types[ $field['type'] ] = array(
+			$all_field_types[$field['type']] = array(
 				'name' => ucfirst( $field['type'] ),
 				'icon' => 'frm_icon_font frm_pencil_icon',
 			);
-		} elseif ( ! is_array( $all_field_types[ $field['type'] ] ) ) {
+		} elseif ( ! is_array( $all_field_types[$field['type']] ) ) {
 			// Fallback for fields added in a more basic way.
-			FrmFormsHelper::prepare_field_type( $all_field_types[ $field['type'] ] );
+			FrmFormsHelper::prepare_field_type( $all_field_types[$field['type']] );
 		}
 
-		$type_name = $all_field_types[ $field['type'] ]['name'];
+		$type_name = $all_field_types[$field['type']]['name'];
 		if ( $field['type'] === 'divider' && FrmField::is_option_true( $field, 'repeat' ) ) {
 			$type_name = $all_field_types['divider|repeat']['name'];
 		}
@@ -387,13 +387,13 @@ 
 		$active   = 'default_value';
 
 		foreach ( $settings as $type ) {
-			if ( ! empty( $field[ $type ] ) ) {
+			if ( ! empty( $field[$type] ) ) {
 				$active = $type;
 			}
 		}
 
-		$types[ $active ]['class']  .= ' current';
-		$types[ $active ]['current'] = true;
+		$types[$active]['class']  .= ' current';
+		$types[$active]['current'] = true;
 
 		return $types;
 	}
@@ -407,8 +407,8 @@ 
 			'website' => 'url',
 			'image'   => 'url',
 		);
-		if ( isset( $type_switch[ $type ] ) ) {
-			$type = $type_switch[ $type ];
+		if ( isset( $type_switch[$type] ) ) {
+			$type = $type_switch[$type];
 		}
 
 		$pro_fields = FrmField::pro_field_selection();
@@ -532,11 +532,11 @@ 
 		// include "col" for valid html
 		$unit = trim( preg_replace( '/[0-9]+/', '', $field['size'] ) );
 
-		if ( ! isset( $calc[ $unit ] ) ) {
+		if ( ! isset( $calc[$unit] ) ) {
 			return;
 		}
 
-		$size = (float) str_replace( $unit, '', $field['size'] ) / $calc[ $unit ];
+		$size = (float) str_replace( $unit, '', $field['size'] ) / $calc[$unit];
 
 		$add_html['cols'] = 'cols="' . absint( $size ) . '"';
 	}
@@ -729,11 +729,11 @@ 
 	private static function get_form_for_js_validation( $field ) {
 		global $frm_vars;
 		if ( ! empty( $frm_vars['js_validate_forms'] ) ) {
-			if ( isset( $frm_vars['js_validate_forms'][ $field['form_id'] ] ) ) {
-				return $frm_vars['js_validate_forms'][ $field['form_id'] ];
+			if ( isset( $frm_vars['js_validate_forms'][$field['form_id']] ) ) {
+				return $frm_vars['js_validate_forms'][$field['form_id']];
 			}
-			if ( ! empty( $field['parent_form_id'] ) && isset( $frm_vars['js_validate_forms'][ $field['parent_form_id'] ] ) ) {
-				return $frm_vars['js_validate_forms'][ $field['parent_form_id'] ];
+			if ( ! empty( $field['parent_form_id'] ) && isset( $frm_vars['js_validate_forms'][$field['parent_form_id']] ) ) {
+				return $frm_vars['js_validate_forms'][$field['parent_form_id']];
 			}
 		}
 		return false;
@@ -804,10 +804,10 @@ 
 
 			if ( is_numeric( $k ) && strpos( $v, '=' ) ) {
 				$add_html[] = $v;
-			} elseif ( ! empty( $k ) && isset( $add_html[ $k ] ) ) {
-				$add_html[ $k ] = str_replace( $k . '="', $k . '="' . $v, $add_html[ $k ] );
+			} elseif ( ! empty( $k ) && isset( $add_html[$k] ) ) {
+				$add_html[$k] = str_replace( $k . '="', $k . '="' . $v, $add_html[$k] );
 			} else {
-				$add_html[ $k ] = $k . '="' . esc_attr( $v ) . '"';
+				$add_html[$k] = $k . '="' . esc_attr( $v ) . '"';
 			}
 
 			unset( $k, $v );