Strategy11 / formidable-forms

classes/models/FrmApplicationTemplate.php

Spacing +8 added lines, -8 removed lines

@@ -37,7 +37,7 @@ 
 		 *
 		 * @param array $keys
 		 */
-		self::$keys             = apply_filters(
+		self::$keys = apply_filters(
 			'frm_application_data_keys',
 			array( 'key', 'name', 'description', 'link', 'categories', 'views', 'forms', 'used_addons' )
 		);
@@ -45,7 +45,7 @@ 
 			self::get_template_keys_with_local_png_images(),
 			self::get_template_keys_with_local_webp_images()
 		);
-		self::$categories       = array();
+		self::$categories = array();
 	}
 
 	/**
@@ -144,20 +144,20 @@ 
 
 		$application = array();
 		foreach ( self::$keys as $key ) {
-			if ( ! isset( $this->api_data[ $key ] ) ) {
+			if ( ! isset( $this->api_data[$key] ) ) {
 				continue;
 			}
 
-			$value = $this->api_data[ $key ];
+			$value = $this->api_data[$key];
 
 			if ( 'icon' === $key ) {
 				// Icon is an array. The first array item is the image URL.
-				$application[ $key ] = reset( $value );
+				$application[$key] = reset( $value );
 			} elseif ( 'categories' === $key ) {
-				$application[ $key ] = array_values(
+				$application[$key] = array_values(
 					array_filter(
 						$value,
-						function ( $category ) {
+						function( $category ) {
 							return false === strpos( $category, '+Views' );
 						}
 					)
@@ -173,7 +173,7 @@ 
 					// Strip off the " Template" text at the end of the name as it takes up space.
 					$value = substr( $value, 0, -9 );
 				}
-				$application[ $key ] = $value;
+				$application[$key] = $value;
 			}//end if
 		}//end foreach
 

classes/models/fields/FrmFieldCombo.php

Spacing +13 added lines, -13 removed lines

@@ -61,12 +61,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,
@@ -89,7 +89,7 @@ 
 	 */
 	public function set_aria_invalid_error( &$shortcode_atts, $args ) {
 		foreach ( $this->get_sub_fields() as $sub_field ) {
-			$shortcode_atts[ 'aria-invalid-' . $sub_field['name'] ] = isset( $args['errors'][ 'field' . $this->field_id . '-' . $sub_field['name'] ] ) ? 'true' : 'false';
+			$shortcode_atts['aria-invalid-' . $sub_field['name']] = isset( $args['errors']['field' . $this->field_id . '-' . $sub_field['name']] ) ? 'true' : 'false';
 		}
 	}
 
@@ -135,9 +135,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']] = '';
 				}
 			}
 		}
@@ -163,7 +163,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';
 			}
@@ -193,7 +193,7 @@ 
 			$default_value = array();
 
 			foreach ( $this->sub_fields as $name => $sub_field ) {
-				$default_value[ $name ] = '';
+				$default_value[$name] = '';
 			}
 
 			return $default_value;
@@ -375,8 +375,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']];
 			}
 		}
 
@@ -437,9 +437,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;
 			}
 		}
 
@@ -458,7 +458,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/helpers/FrmFieldsHelper.php

Braces +8 added lines, -4 removed lines

@@ -197,7 +197,8 @@ 
 				return false;
 			}
 
-			if ( ! $_POST || ! isset( $_POST['field_options'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+			if ( ! $_POST || ! isset( $_POST['field_options'] ) ) {
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
 				return false;
 			}
 
@@ -300,7 +301,8 @@ 
 	 * @param mixed  $value
 	 */
 	private static function get_posted_field_setting( $setting, &$value ) {
-		if ( ! isset( $_POST['field_options'][ $setting ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+		if ( ! isset( $_POST['field_options'][ $setting ] ) ) {
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
 			return;
 		}
 
@@ -1353,7 +1355,8 @@ 
 
 		// 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'] ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+		if ( $parent && isset( $_POST['item_meta'][ $parent ][ $pointer ]['other'][ $field['id'] ] ) ) {
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
 			if ( FrmField::is_field_with_multiple_values( $field ) ) {
 				// phpcs:ignore WordPress.Security.NonceVerification.Missing
 				$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 ] ) ) : '';
@@ -1364,7 +1367,8 @@ 
 			return $other_val;
 		}
 
-		if ( isset( $field['id'] ) && isset( $_POST['item_meta']['other'][ $field['id'] ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+		if ( isset( $field['id'] ) && isset( $_POST['item_meta']['other'][ $field['id'] ] ) ) {
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
 			// For normal fields
 
 			if ( FrmField::is_field_with_multiple_values( $field ) ) {

Spacing +50 added lines, -50 removed lines

@@ -38,7 +38,7 @@ 
 			if ( in_array( $type, array( 'data', 'lookup' ), true ) ) {
 				$values['field_options']['data_type'] = $setting;
 			} else {
-				$values['field_options'][ $setting ] = 1;
+				$values['field_options'][$setting] = 1;
 			}
 		}
 
@@ -172,10 +172,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] );
 			}
 		}
 	}
@@ -192,7 +192,7 @@ 
 			return self::$context_is_safe_to_load_field_options_from_request_data;
 		}
 
-		$function = function () {
+		$function = function() {
 			if ( ! FrmAppHelper::is_admin_page() ) {
 				return false;
 			}
@@ -300,12 +300,12 @@ 
 	 * @param mixed  $value
 	 */
 	private static function get_posted_field_setting( $setting, &$value ) {
-		if ( ! isset( $_POST['field_options'][ $setting ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+		if ( ! isset( $_POST['field_options'][$setting] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
 			return;
 		}
 
 		if ( strpos( $setting, 'html' ) !== false ) {
-			$value = wp_unslash( $_POST['field_options'][ $setting ] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
+			$value = wp_unslash( $_POST['field_options'][$setting] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
 
 			// Conditionally strip script tags if the user sending $_POST data is not allowed to use unfiltered HTML.
 			if ( ! FrmAppHelper::allow_unfiltered_html() ) {
@@ -313,9 +313,9 @@ 
 			}
 		} elseif ( strpos( $setting, 'format_' ) === 0 ) {
 			// TODO: Remove stripslashes on output, and use on input only.
-			$value = sanitize_text_field( $_POST['field_options'][ $setting ] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.MissingUnslash, WordPress.Security.NonceVerification.Missing
+			$value = sanitize_text_field( $_POST['field_options'][$setting] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.MissingUnslash, WordPress.Security.NonceVerification.Missing
 		} else {
-			$value = wp_unslash( $_POST['field_options'][ $setting ] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
+			$value = wp_unslash( $_POST['field_options'][$setting] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
 			FrmAppHelper::sanitize_value( 'wp_kses_post', $value );
 		}
 	}
@@ -388,7 +388,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};
 		}
 	}
 
@@ -426,7 +426,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 );
 
 		$msg = self::maybe_replace_substrings_with_field_name( $msg, $error, $field );
@@ -696,7 +696,7 @@ 
 			'inside_class' => 'inside',
 			'dismiss-icon' => true,
 		);
-		$args     = array_merge( $defaults, $args );
+		$args = array_merge( $defaults, $args );
 
 		include FrmAppHelper::plugin_path() . '/classes/views/frm-fields/back-end/inline-modal.php';
 	}
@@ -934,7 +934,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;
@@ -944,7 +944,7 @@ 
 			if ( $replace_with !== null ) {
 				$replace_with = self::trigger_shortcode_atts( $replace_with, $atts );
 				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 );
@@ -962,7 +962,7 @@ 
 		$supported_atts = array( 'remove_accents', 'sanitize', 'sanitize_url' );
 		$included_atts  = array_intersect( $supported_atts, array_keys( $atts ) );
 		foreach ( $included_atts as $included_att ) {
-			if ( '0' === $atts[ $included_att ] ) {
+			if ( '0' === $atts[$included_att] ) {
 				// Skip any option that uses 0 so sanitize_url=0 does not encode.
 				continue;
 			}
@@ -1040,8 +1040,8 @@ 
 
 		$dynamic_default = array( 'admin_email', 'siteurl', 'frmurl', 'sitename', 'get', 'default-email', 'default-from-email' );
 
-		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, true ) ) {
 			$replace_with = self::dynamic_default_values( $atts['tag'], $atts );
 		} elseif ( $clean_tag === 'user_agent' ) {
@@ -1265,8 +1265,8 @@ 
 			self::field_types_for_input( $single_input, $field_selection, $field_types );
 		} elseif ( in_array( $type, $multiple_input, true ) ) {
 			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' ) );
@@ -1308,7 +1308,7 @@ 
 		foreach ( $inputs as $input ) {
 			// This may not be set if a field type was removed using the frm_available_fields or frm_pro_available_fields filters.
 			if ( array_key_exists( $input, $fields ) ) {
-				$field_types[ $input ] = $fields[ $input ];
+				$field_types[$input] = $fields[$input];
 			}
 			unset( $input );
 		}
@@ -1341,7 +1341,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'];
@@ -1357,25 +1357,25 @@ 
 
 		// 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'] ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+		if ( $parent && isset( $_POST['item_meta'][$parent][$pointer]['other'][$field['id']] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
 			if ( FrmField::is_field_with_multiple_values( $field ) ) {
 				// phpcs:ignore WordPress.Security.NonceVerification.Missing
-				$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'] ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
+				$other_val = sanitize_text_field( wp_unslash( $_POST['item_meta'][$parent][$pointer]['other'][$field['id']] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
 			}
 
 			return $other_val;
 		}
 
-		if ( isset( $field['id'] ) && isset( $_POST['item_meta']['other'][ $field['id'] ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+		if ( isset( $field['id'] ) && isset( $_POST['item_meta']['other'][$field['id']] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
 			// For normal fields
 
 			if ( FrmField::is_field_with_multiple_values( $field ) ) {
 				// phpcs:ignore WordPress.Security.NonceVerification.Missing
-				$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'] ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
+				$other_val = sanitize_text_field( wp_unslash( $_POST['item_meta']['other'][$field['id']] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
 			}
 
 			return $other_val;
@@ -1385,8 +1385,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 {
 			/**
@@ -1398,8 +1398,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
@@ -1610,11 +1610,11 @@ 
 			foreach ( $val as $k => $v ) {
 				if ( is_string( $v ) ) {
 					if ( 'custom_html' === $k ) {
-						$val[ $k ] = self::switch_ids_except_strings( $replace, $replace_with, array( '[if description]', '[description]', '[/if description]' ), $v );
+						$val[$k] = self::switch_ids_except_strings( $replace, $replace_with, array( '[if description]', '[description]', '[/if description]' ), $v );
 						unset( $k, $v );
 						continue;
 					}
-					$val[ $k ] = str_replace( $replace, $replace_with, $v );
+					$val[$k] = str_replace( $replace, $replace_with, $v );
 					unset( $k, $v );
 				}
 			}
@@ -1643,8 +1643,8 @@ 
 			if ( false === $index ) {
 				continue;
 			}
-			unset( $replace[ $index ] );
-			unset( $replace_with[ $index ] );
+			unset( $replace[$index] );
+			unset( $replace_with[$index] );
 		}
 		$value = str_replace( $replace, $replace_with, $value );
 		return $value;
@@ -1992,7 +1992,7 @@ 
 			$countries['class'] = 'frm-countries-opts';
 		}
 
-		$prepop[ __( 'Countries', 'formidable' ) ] = $countries;
+		$prepop[__( 'Countries', 'formidable' )] = $countries;
 
 		// State abv.
 		$states    = self::get_us_states();
@@ -2002,7 +2002,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 );
@@ -2011,7 +2011,7 @@ 
 			$states['class'] = 'frm-states-opts';
 		}
 
-		$prepop[ __( 'U.S. States', 'formidable' ) ] = $states;
+		$prepop[__( 'U.S. States', 'formidable' )] = $states;
 		unset( $state_abv, $states );
 
 		// Age.
@@ -2029,7 +2029,7 @@ 
 			$ages['class'] = 'frm-age-opts';
 		}
 
-		$prepop[ __( 'Age', 'formidable' ) ] = $ages;
+		$prepop[__( 'Age', 'formidable' )] = $ages;
 
 		// Satisfaction.
 		$satisfaction = array(
@@ -2044,7 +2044,7 @@ 
 			$satisfaction['class'] = 'frm-satisfaction-opts';
 		}
 
-		$prepop[ __( 'Satisfaction', 'formidable' ) ] = $satisfaction;
+		$prepop[__( 'Satisfaction', 'formidable' )] = $satisfaction;
 
 		// Importance.
 		$importance = array(
@@ -2059,7 +2059,7 @@ 
 			$importance['class'] = 'frm-importance-opts';
 		}
 
-		$prepop[ __( 'Importance', 'formidable' ) ] = $importance;
+		$prepop[__( 'Importance', 'formidable' )] = $importance;
 
 		// Agreement.
 		$agreement = array(
@@ -2074,7 +2074,7 @@ 
 			$agreement['class'] = 'frm-agreement-opts';
 		}
 
-		$prepop[ __( 'Agreement', 'formidable' ) ] = $agreement;
+		$prepop[__( 'Agreement', 'formidable' )] = $agreement;
 
 		// Likely.
 		$likely = array(
@@ -2089,7 +2089,7 @@ 
 			$likely['class'] = 'frm-likely-opts';
 		}
 
-		$prepop[ __( 'Likely', 'formidable' ) ] = $likely;
+		$prepop[__( 'Likely', 'formidable' )] = $likely;
 
 		$prepop = apply_filters( 'frm_bulk_field_choices', $prepop );
 	}
@@ -2310,16 +2310,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 );
 			}
 		}
 	}
@@ -2340,8 +2340,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];
 			}
 		}
 
@@ -2407,7 +2407,7 @@ 
 
 		return array_filter(
 			$rows,
-			function ( $row ) {
+			function( $row ) {
 				FrmAppHelper::unserialize_or_decode( $row->field_options );
 				return is_array( $row->field_options ) && ! empty( $row->field_options['draft'] );
 			}
@@ -2470,7 +2470,7 @@ 
 		if ( empty( $attributes['data-fid'] ) ) {
 			unset( $data['plugin-status'] );
 			foreach ( $data as $key => $value ) {
-				$attributes[ 'data-' . $key ] = $value;
+				$attributes['data-' . $key] = $value;
 			}
 		}
 

classes/helpers/FrmOnSubmitHelper.php

Spacing +11 added lines, -11 removed lines

@@ -329,17 +329,17 @@ 
 	public static function populate_on_submit_data( &$form_options, $action = null, $event = 'create' ) {
 		$opt = 'update' === $event ? 'edit_' : 'success_';
 		if ( ! $action || ! is_object( $action ) ) {
-			$form_options[ $opt . 'action' ] = self::get_default_action_type();
-			$form_options[ $opt . 'msg' ]    = self::get_default_msg();
+			$form_options[$opt . 'action'] = self::get_default_action_type();
+			$form_options[$opt . 'msg']    = self::get_default_msg();
 
 			return;
 		}
 
-		$form_options[ $opt . 'action' ] = isset( $action->post_content['success_action'] ) ? $action->post_content['success_action'] : 'message';
+		$form_options[$opt . 'action'] = isset( $action->post_content['success_action'] ) ? $action->post_content['success_action'] : 'message';
 
-		switch ( $form_options[ $opt . 'action' ] ) {
+		switch ( $form_options[$opt . 'action'] ) {
 			case 'redirect':
-				$form_options[ $opt . 'url' ]        = isset( $action->post_content['success_url'] ) ? $action->post_content['success_url'] : '';
+				$form_options[$opt . 'url']        = isset( $action->post_content['success_url'] ) ? $action->post_content['success_url'] : '';
 				$form_options['open_in_new_tab']     = ! empty( $action->post_content['open_in_new_tab'] );
 				$form_options['redirect_delay']      = ! empty( $action->post_content['redirect_delay'] );
 				$form_options['redirect_delay_time'] = $action->post_content['redirect_delay_time'];
@@ -347,11 +347,11 @@ 
 				break;
 
 			case 'page':
-				$form_options[ $opt . 'page_id' ] = isset( $action->post_content['success_page_id'] ) ? $action->post_content['success_page_id'] : '';
+				$form_options[$opt . 'page_id'] = isset( $action->post_content['success_page_id'] ) ? $action->post_content['success_page_id'] : '';
 				break;
 
 			default:
-				$form_options[ $opt . 'msg' ] = ! empty( $action->post_content['success_msg'] ) ? $action->post_content['success_msg'] : self::get_default_msg();
+				$form_options[$opt . 'msg'] = ! empty( $action->post_content['success_msg'] ) ? $action->post_content['success_msg'] : self::get_default_msg();
 				$form_options['show_form']    = ! empty( $action->post_content['show_form'] );
 		}
 	}
@@ -440,20 +440,20 @@ 
 	private static function get_on_submit_action_data_from_form_options( $form_options, $event = 'create' ) {
 		$opt  = 'update' === $event ? 'edit_' : 'success_';
 		$data = array(
-			'success_action' => isset( $form_options[ $opt . 'action' ] ) ? $form_options[ $opt . 'action' ] : self::get_default_action_type(),
+			'success_action' => isset( $form_options[$opt . 'action'] ) ? $form_options[$opt . 'action'] : self::get_default_action_type(),
 		);
 
 		switch ( $data['success_action'] ) {
 			case 'redirect':
-				$data['success_url'] = isset( $form_options[ $opt . 'url' ] ) ? $form_options[ $opt . 'url' ] : '';
+				$data['success_url'] = isset( $form_options[$opt . 'url'] ) ? $form_options[$opt . 'url'] : '';
 				break;
 
 			case 'page':
-				$data['success_page_id'] = isset( $form_options[ $opt . 'page_id' ] ) ? $form_options[ $opt . 'page_id' ] : '';
+				$data['success_page_id'] = isset( $form_options[$opt . 'page_id'] ) ? $form_options[$opt . 'page_id'] : '';
 				break;
 
 			default:
-				$data['success_msg'] = isset( $form_options[ $opt . 'msg' ] ) ? $form_options[ $opt . 'msg' ] : self::get_default_msg();
+				$data['success_msg'] = isset( $form_options[$opt . 'msg'] ) ? $form_options[$opt . 'msg'] : self::get_default_msg();
 				$data['show_form']   = ! empty( $form_options['show_form'] );
 		}
 

classes/models/FrmEntry.php

Spacing +23 added lines, -23 removed lines

@@ -54,8 +54,8 @@ 
 	 * @return void
 	 */
 	private static function flag_new_unique_key( $unique_id ) {
-		if ( ! isset( self::$unique_id_match_checks[ $unique_id ] ) ) {
-			self::$unique_id_match_checks[ $unique_id ] = false;
+		if ( ! isset( self::$unique_id_match_checks[$unique_id] ) ) {
+			self::$unique_id_match_checks[$unique_id] = false;
 		}
 	}
 
@@ -107,7 +107,7 @@ 
 				if ( 0 === (int) $meta->field_id ) {
 					continue;
 				}
-				$field_metas[ $meta->field_id ] = $meta->meta_value;
+				$field_metas[$meta->field_id] = $meta->meta_value;
 			}
 
 			$filtered_vals = array_filter( $values['item_meta'] );
@@ -172,8 +172,8 @@ 
 			return false;
 		}
 
-		if ( isset( self::$unique_id_match_checks[ $unique_id ] ) ) {
-			return self::$unique_id_match_checks[ $unique_id ];
+		if ( isset( self::$unique_id_match_checks[$unique_id] ) ) {
+			return self::$unique_id_match_checks[$unique_id];
 		}
 
 		$timestamp = strtotime( $created_at );
@@ -181,7 +181,7 @@ 
 			$timestamp = time();
 		}
 
-		self::$unique_id_match_checks[ $unique_id ] = (bool) FrmDb::get_var(
+		self::$unique_id_match_checks[$unique_id] = (bool) FrmDb::get_var(
 			'frm_item_metas',
 			array(
 				'field_id'     => 0,
@@ -191,7 +191,7 @@ 
 			'id'
 		);
 
-		return self::$unique_id_match_checks[ $unique_id ];
+		return self::$unique_id_match_checks[$unique_id];
 	}
 
 	/**
@@ -221,10 +221,10 @@ 
 		$reduced = array();
 		foreach ( $filter_vals as $field_id => $value ) {
 			$field                = FrmFieldFactory::get_field_object( $field_id );
-			$reduced[ $field_id ] = $field->get_value_to_save( $value, array( 'entry_id' => $entry_id ) );
-			$reduced[ $field_id ] = $field->set_value_before_save( $reduced[ $field_id ] );
-			if ( '' === $reduced[ $field_id ] || ( is_array( $reduced[ $field_id ] ) && 0 === count( $reduced[ $field_id ] ) ) ) {
-				unset( $reduced[ $field_id ] );
+			$reduced[$field_id] = $field->get_value_to_save( $value, array( 'entry_id' => $entry_id ) );
+			$reduced[$field_id] = $field->set_value_before_save( $reduced[$field_id] );
+			if ( '' === $reduced[$field_id] || ( is_array( $reduced[$field_id] ) && 0 === count( $reduced[$field_id] ) ) ) {
+				unset( $reduced[$field_id] );
 			}
 		}
 		return $reduced;
@@ -487,7 +487,7 @@ 
 	private static function prepare_entries( &$entries ) {
 		foreach ( $entries as $k => $entry ) {
 			self::prepare_entry( $entry );
-			$entries[ $k ] = $entry;
+			$entries[$k] = $entry;
 		}
 	}
 
@@ -513,19 +513,19 @@ 
 			FrmFieldsHelper::prepare_field_value( $meta_val->meta_value, $meta_val->type );
 
 			if ( $meta_val->item_id == $entry->id ) {
-				$entry->metas[ $meta_val->field_id ] = $meta_val->meta_value;
+				$entry->metas[$meta_val->field_id] = $meta_val->meta_value;
 				if ( $include_key ) {
-					$entry->metas[ $meta_val->field_key ] = $entry->metas[ $meta_val->field_id ];
+					$entry->metas[$meta_val->field_key] = $entry->metas[$meta_val->field_id];
 				}
 				continue;
 			}
 
 			// include sub entries in an array
-			if ( ! isset( $entry->metas[ $meta_val->field_id ] ) ) {
-				$entry->metas[ $meta_val->field_id ] = array();
+			if ( ! isset( $entry->metas[$meta_val->field_id] ) ) {
+				$entry->metas[$meta_val->field_id] = array();
 			}
 
-			$entry->metas[ $meta_val->field_id ][] = $meta_val->meta_value;
+			$entry->metas[$meta_val->field_id][] = $meta_val->meta_value;
 
 			unset( $meta_val );
 		}
@@ -620,16 +620,16 @@ 
 		}
 
 		foreach ( $metas as $m_key => $meta_val ) {
-			if ( ! isset( $entries[ $meta_val->item_id ] ) ) {
+			if ( ! isset( $entries[$meta_val->item_id] ) ) {
 				continue;
 			}
 
-			if ( ! isset( $entries[ $meta_val->item_id ]->metas ) ) {
-				$entries[ $meta_val->item_id ]->metas = array();
+			if ( ! isset( $entries[$meta_val->item_id]->metas ) ) {
+				$entries[$meta_val->item_id]->metas = array();
 			}
 
 			FrmFieldsHelper::prepare_field_value( $meta_val->meta_value, $meta_val->type );
-			$entries[ $meta_val->item_id ]->metas[ $meta_val->field_id ] = $meta_val->meta_value;
+			$entries[$meta_val->item_id]->metas[$meta_val->field_id] = $meta_val->meta_value;
 			unset( $m_key, $meta_val );
 		}
 
@@ -812,7 +812,7 @@ 
 	}
 
 	private static function get_entry_value( $values, $name, $default ) {
-		return isset( $values[ $name ] ) ? $values[ $name ] : $default;
+		return isset( $values[$name] ) ? $values[$name] : $default;
 	}
 
 	/**
@@ -1019,7 +1019,7 @@ 
 	private static function maybe_add_captcha_meta( $form_id, $entry_id ) {
 		global $frm_vars;
 		if ( array_key_exists( 'captcha_scores', $frm_vars ) && array_key_exists( $form_id, $frm_vars['captcha_scores'] ) ) {
-			$captcha_score_meta = array( 'captcha_score' => $frm_vars['captcha_scores'][ $form_id ] );
+			$captcha_score_meta = array( 'captcha_score' => $frm_vars['captcha_scores'][$form_id] );
 			FrmEntryMeta::add_entry_meta( $entry_id, 0, '', maybe_serialize( $captcha_score_meta ) );
 		}
 	}

classes/helpers/FrmAddonsHelper.php

Spacing +2 added lines, -2 removed lines

@@ -171,7 +171,7 @@ 
 			'convertkit'                      => 'convertkit',
 		);
 
-		$icon = array_key_exists( $slug, $icons_map ) ? 'frm_' . $icons_map[ $slug ] . '_icon' : 'frm_logo_icon';
+		$icon = array_key_exists( $slug, $icons_map ) ? 'frm_' . $icons_map[$slug] . '_icon' : 'frm_logo_icon';
 		if ( 'ai' === $slug ) {
 			$icon = str_replace( '_', '-', $icon );
 		}
@@ -271,7 +271,7 @@ 
 		?>
 		<span style="color: <?php echo esc_attr( $color ); ?>;">
 			<?php
-			for ( $i = 0; $i < 5; $i++ ) {
+			for ( $i = 0; $i < 5; $i ++ ) {
 				echo $icon; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 			}
 			?>

classes/controllers/FrmFormActionsController.php

Spacing +17 added lines, -17 removed lines

@@ -113,19 +113,19 @@ 
 		}
 
 		foreach ( $action_controls as $action ) {
-			if ( isset( $groups[ $action->id_base ] ) || in_array( $action->id_base, $grouped ) ) {
+			if ( isset( $groups[$action->id_base] ) || in_array( $action->id_base, $grouped ) ) {
 				continue;
 			}
 
 			$this_group = $action->action_options['group'];
-			if ( ! isset( $groups[ $this_group ] ) ) {
+			if ( ! isset( $groups[$this_group] ) ) {
 				$this_group = 'misc';
 			}
 
-			if ( ! isset( $groups[ $this_group ]['actions'] ) ) {
-				$groups[ $this_group ]['actions'] = array();
+			if ( ! isset( $groups[$this_group]['actions'] ) ) {
+				$groups[$this_group]['actions'] = array();
 			}
-			$groups[ $this_group ]['actions'][] = $action->id_base;
+			$groups[$this_group]['actions'][] = $action->id_base;
 
 			unset( $action );
 		}
@@ -279,7 +279,7 @@ 
 				return $a;
 			}
 
-			$actions[ $a->id_base ] = $a;
+			$actions[$a->id_base] = $a;
 		}
 
 		return $actions;
@@ -313,18 +313,18 @@ 
 		$action_map = array();
 
 		foreach ( $action_controls as $key => $control ) {
-			$action_map[ $control->id_base ] = $key;
+			$action_map[$control->id_base] = $key;
 		}
 
 		self::maybe_show_limit_warning( $form->id, $form_actions );
 
 		foreach ( $form_actions as $action ) {
-			if ( ! isset( $action_map[ $action->post_excerpt ] ) ) {
+			if ( ! isset( $action_map[$action->post_excerpt] ) ) {
 				// don't try and show settings if action no longer exists
 				continue;
 			}
 
-			self::action_control( $action, $form, $action->ID, $action_controls[ $action_map[ $action->post_excerpt ] ], $values );
+			self::action_control( $action, $form, $action->ID, $action_controls[$action_map[$action->post_excerpt]], $values );
 		}
 	}
 
@@ -592,8 +592,8 @@ 
 			}
 
 			// Store actions so they can be triggered with the correct priority.
-			$stored_actions[ $action->ID ]  = $action;
-			$action_priority[ $action->ID ] = $link_settings[ $action->post_excerpt ]->action_options['priority'];
+			$stored_actions[$action->ID]  = $action;
+			$action_priority[$action->ID] = $link_settings[$action->post_excerpt]->action_options['priority'];
 
 			unset( $action );
 		}//end foreach
@@ -605,7 +605,7 @@ 
 			new FrmNotification();
 
 			foreach ( $action_priority as $action_id => $priority ) {
-				$action = $stored_actions[ $action_id ];
+				$action = $stored_actions[$action_id];
 
 				/**
 				 * Allows custom form action trigger.
@@ -669,12 +669,12 @@ 
 	}
 
 	public function register( $action_class ) {
-		$this->actions[ $action_class ] = new $action_class();
+		$this->actions[$action_class] = new $action_class();
 	}
 
 	public function unregister( $action_class ) {
-		if ( isset( $this->actions[ $action_class ] ) ) {
-			unset( $this->actions[ $action_class ] );
+		if ( isset( $this->actions[$action_class] ) ) {
+			unset( $this->actions[$action_class] );
 		}
 	}
 
@@ -683,8 +683,8 @@ 
 
 		foreach ( $keys as $key ) {
 			// don't register new action if old action with the same id is already registered
-			if ( ! isset( $this->actions[ $key ] ) ) {
-				$this->actions[ $key ]->_register();
+			if ( ! isset( $this->actions[$key] ) ) {
+				$this->actions[$key]->_register();
 			}
 		}
 	}

classes/helpers/FrmCSVExportHelper.php

Spacing +54 added lines, -54 removed lines

@@ -128,7 +128,7 @@ 
 
 		unset( $filename );
 
-		$comment_count       = FrmDb::get_count(
+		$comment_count = FrmDb::get_count(
 			'frm_item_metas',
 			array(
 				'item_id'         => $atts['entry_ids'],
@@ -259,7 +259,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,
@@ -283,10 +283,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,
@@ -307,14 +307,14 @@ 
 			if ( self::is_the_child_of_a_repeater( $col ) ) {
 				$repeater_id = $col->field_options['in_section'];
 				// Set a placeholder to maintain order for repeater fields.
-				$headings[ 'repeater' . $repeater_id ] = array();
+				$headings['repeater' . $repeater_id] = array();
 
-				if ( ! isset( $fields_by_repeater_id[ $repeater_id ] ) ) {
-					$fields_by_repeater_id[ $repeater_id ] = array();
+				if ( ! isset( $fields_by_repeater_id[$repeater_id] ) ) {
+					$fields_by_repeater_id[$repeater_id] = array();
 					$repeater_ids[]                        = $repeater_id;
 				}
 
-				$fields_by_repeater_id[ $repeater_id ][] = $col;
+				$fields_by_repeater_id[$repeater_id][] = $col;
 
 				continue;
 			}
@@ -333,8 +333,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 );
@@ -345,17 +345,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;
 				}
 			}
 
@@ -368,10 +368,10 @@ 
 		}//end if
 
 		if ( self::$comment_count ) {
-			for ( $i = 0; $i < self::$comment_count; $i++ ) {
-				$headings[ 'comment' . $i ]            = __( 'Comment', 'formidable' );
-				$headings[ 'comment_user_id' . $i ]    = __( 'Comment User', 'formidable' );
-				$headings[ 'comment_created_at' . $i ] = __( 'Comment Date', 'formidable' );
+			for ( $i = 0; $i < self::$comment_count; $i ++ ) {
+				$headings['comment' . $i]            = __( 'Comment', 'formidable' );
+				$headings['comment_user_id' . $i]    = __( 'Comment User', 'formidable' );
+				$headings['comment_created_at' . $i] = __( 'Comment Date', 'formidable' );
 			}
 			unset( $i );
 		}
@@ -416,7 +416,7 @@ 
 
 	private static function prepare_next_csv_rows( $next_set ) {
 		if ( FrmAppHelper::pro_is_installed() ) {
-			$where    = array(
+			$where = array(
 				'or'             => 1,
 				'id'             => $next_set,
 				'parent_item_id' => $next_set,
@@ -473,32 +473,32 @@ 
 					continue;
 				}
 
-				if ( ! isset( $entries[ self::$entry->parent_item_id ] ) ) {
-					$entries[ self::$entry->parent_item_id ]        = new stdClass();
-					$entries[ self::$entry->parent_item_id ]->metas = array();
+				if ( ! isset( $entries[self::$entry->parent_item_id] ) ) {
+					$entries[self::$entry->parent_item_id]        = new stdClass();
+					$entries[self::$entry->parent_item_id]->metas = array();
 				}
 
-				if ( ! isset( $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] ) ) {
-					$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] = array();
-				} elseif ( ! is_array( $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] ) ) {
+				if ( ! isset( $entries[self::$entry->parent_item_id]->metas[$meta_id] ) ) {
+					$entries[self::$entry->parent_item_id]->metas[$meta_id] = array();
+				} elseif ( ! is_array( $entries[self::$entry->parent_item_id]->metas[$meta_id] ) ) {
 					// if the data is here, it should be an array but if this field has collected data
 					// both while inside and outside of the repeating section, it's possible this is a string.
-					$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] = (array) $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ];
+					$entries[self::$entry->parent_item_id]->metas[$meta_id] = (array) $entries[self::$entry->parent_item_id]->metas[$meta_id];
 				}
 
 				// Add the repeated values.
-				$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ][] = $meta_value;
+				$entries[self::$entry->parent_item_id]->metas[$meta_id][] = $meta_value;
 			}//end foreach
 
 			self::$entry->metas                              = self::fill_missing_repeater_metas( self::$entry->metas, $entries );
-			$entries[ self::$entry->parent_item_id ]->metas += self::$entry->metas;
+			$entries[self::$entry->parent_item_id]->metas += self::$entry->metas;
 		}//end if
 
 		// add the embedded form id
-		if ( ! isset( $entries[ self::$entry->parent_item_id ]->embedded_fields ) ) {
-			$entries[ self::$entry->parent_item_id ]->embedded_fields = array();
+		if ( ! isset( $entries[self::$entry->parent_item_id]->embedded_fields ) ) {
+			$entries[self::$entry->parent_item_id]->embedded_fields = array();
 		}
-		$entries[ self::$entry->parent_item_id ]->embedded_fields[ self::$entry->id ] = self::$entry->form_id;
+		$entries[self::$entry->parent_item_id]->embedded_fields[self::$entry->id] = self::$entry->form_id;
 	}
 
 	/**
@@ -519,19 +519,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][] = '';
 			}
 		}
 
@@ -550,7 +550,7 @@ 
 
 	private static function add_field_values_to_csv( &$row ) {
 		foreach ( self::$fields as $col ) {
-			$field_value = isset( self::$entry->metas[ $col->id ] ) ? self::$entry->metas[ $col->id ] : false;
+			$field_value = isset( self::$entry->metas[$col->id] ) ? self::$entry->metas[$col->id] : false;
 
 			FrmFieldsHelper::prepare_field_value( $field_value, $col->type );
 			self::add_array_values_to_columns( $row, compact( 'col', 'field_value' ) );
@@ -569,20 +569,20 @@ 
 			if ( ! empty( $col->field_options['separate_value'] ) ) {
 				$label_key = $col->id . '_label';
 				if ( self::is_the_child_of_a_repeater( $col ) ) {
-					$row[ $label_key ] = array();
+					$row[$label_key] = array();
 
 					if ( is_array( $field_value ) ) {
 						foreach ( $field_value as $value ) {
-							$row[ $label_key ][] = self::get_separate_value_label( $value, $col );
+							$row[$label_key][] = self::get_separate_value_label( $value, $col );
 						}
 					}
 				} else {
-					$row[ $label_key ] = self::get_separate_value_label( $field_value, $col );
+					$row[$label_key] = self::get_separate_value_label( $field_value, $col );
 				}
 				unset( $label_key );
 			}
 
-			$row[ $col->id ] = $field_value;
+			$row[$col->id] = $field_value;
 
 			unset( $col, $field_value );
 		}//end foreach
@@ -605,7 +605,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,
 			)
 		);
 	}
@@ -620,8 +620,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;
 						}
 					}
 
@@ -629,8 +629,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;
 				}
 			}
 		}
@@ -655,18 +655,18 @@ 
 		$echo = 'echo' === self::$mode;
 
 		foreach ( self::$headings as $k => $heading ) {
-			if ( isset( $rows[ $k ] ) ) {
-				$row = $rows[ $k ];
+			if ( isset( $rows[$k] ) ) {
+				$row = $rows[$k];
 			} else {
 				$row = '';
 				// array indexed data is not at $rows[ $k ]
-				if ( $k[ strlen( $k ) - 1 ] === ']' ) {
+				if ( $k[strlen( $k ) - 1] === ']' ) {
 					$start = strrpos( $k, '[' );
-					$key   = substr( $k, 0, $start++ );
+					$key   = substr( $k, 0, $start ++ );
 					$index = substr( $k, $start, strlen( $k ) - 1 - $start );
 
-					if ( isset( $rows[ $key ] ) && isset( $rows[ $key ][ $index ] ) ) {
-						$row = $rows[ $key ][ $index ];
+					if ( isset( $rows[$key] ) && isset( $rows[$key][$index] ) ) {
+						$row = $rows[$key][$index];
 					}
 
 					unset( $start, $key, $index );

classes/models/fields/FrmFieldEmail.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 		}
 		$errors = array();
 		if ( false !== strpos( $args['value'], '.@' ) || ! is_email( $args['value'] ) ) {
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' );
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' );
 		}
 		return $errors;
 	}