Strategy11 / formidable-forms

classes/views/frm-forms/add_field_links.php

Spacing +3 added lines, -3 removed lines

@@ -76,10 +76,10 @@
 								foreach ( $pro_fields as $field_key => $field_type ) {
 
 									if ( isset( $field_type['section'] ) ) {
-										if ( ! isset( $field_sections[ $field_type['section'] ] ) ) {
-											$field_sections[ $field_type['section'] ] = array();
+										if ( ! isset( $field_sections[$field_type['section']] ) ) {
+											$field_sections[$field_type['section']] = array();
 										}
-										$field_sections[ $field_type['section'] ][ $field_key ] = $field_type;
+										$field_sections[$field_type['section']][$field_key] = $field_type;
 										continue;
 									}
 

classes/models/fields/FrmFieldType.php

Spacing +22 added lines, -22 removed lines

@@ -156,8 +156,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;
@@ -171,7 +171,7 @@ 
 		if ( is_object( $this->field ) ) {
 			$this->field->{$column} = $value;
 		} elseif ( is_array( $this->field ) ) {
-			$this->field[ $column ] = $value;
+			$this->field[$column] = $value;
 		}
 	}
 
@@ -637,7 +637,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'] )
 			);
 			FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown8_icon frm_svg13', array( 'aria-hidden' => 'true' ) );
 			?>
@@ -737,7 +737,7 @@ 
 	 * New field
 	 */
 	public function get_new_field_defaults() {
-		$field        = array(
+		$field = array(
 			'name'          => $this->get_new_field_name(),
 			'description'   => '',
 			'type'          => $this->type,
@@ -768,8 +768,8 @@ 
 
 		$fields = array_merge( $fields, $pro_fields );
 
-		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;
@@ -786,7 +786,7 @@ 
 	 * @return array
 	 */
 	public function get_default_field_options() {
-		$opts        = array(
+		$opts = array(
 			'size'               => '',
 			'max'                => '',
 			'label'              => '',
@@ -1030,7 +1030,7 @@ 
 	 * @return void
 	 */
 	public function set_aria_invalid_error( &$shortcode_atts, $args ) {
-		$shortcode_atts['aria-invalid'] = isset( $args['errors'][ 'field' . $this->field_id ] ) ? 'true' : 'false';
+		$shortcode_atts['aria-invalid'] = isset( $args['errors']['field' . $this->field_id] ) ? 'true' : 'false';
 	}
 
 	/**
@@ -1190,11 +1190,11 @@ 
 		}
 
 		$options = array_values( $this->field['options'] );
-		if ( ! isset( $options[ $opt ] ) ) {
+		if ( ! isset( $options[$opt] ) ) {
 			return $hidden;
 		}
 
-		$option = $options[ $opt ];
+		$option = $options[$opt];
 		if ( is_array( $option ) ) {
 			$option = $option['value'];
 		}
@@ -1258,8 +1258,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 );
@@ -1314,7 +1314,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' => '',
@@ -1371,7 +1371,7 @@ 
 			}
 		}
 
-		if ( isset( $args['errors'][ 'field' . $args['field_id'] ] ) && ! $custom_error_fields ) {
+		if ( isset( $args['errors']['field' . $args['field_id']] ) && ! $custom_error_fields ) {
 			if ( $error_comes_first ) {
 				array_unshift( $describedby, 'frm_error_' . $args['html_id'] );
 			} else {
@@ -1449,11 +1449,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;
 	}
 
@@ -1478,7 +1478,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;
 	}
 
 	/**
@@ -1523,8 +1523,8 @@ 
 		$value = $this->prepare_display_value( $value, $atts );
 
 		if ( is_array( $value ) ) {
-			if ( ! empty( $atts['show'] ) && isset( $value[ $atts['show'] ] ) ) {
-				$value = $value[ $atts['show'] ];
+			if ( ! empty( $atts['show'] ) && isset( $value[$atts['show']] ) ) {
+				$value = $value[$atts['show']];
 			} elseif ( empty( $atts['return_array'] ) ) {
 				$sep   = isset( $atts['sep'] ) ? $atts['sep'] : ', ';
 				$value = FrmAppHelper::safe_implode( $sep, $value );
@@ -1654,8 +1654,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/views/frm-fields/back-end/settings.php

Spacing +1 added lines, -1 removed lines

@@ -197,7 +197,7 @@
 						);
 
 						foreach ( $default_value_type['data'] as $data_key => $data_value ) {
-							$toggle_args['input_html'][ 'data-' . $data_key ] = $data_value . ( substr( $data_value, -1 ) === '-' ? $field['id'] : '' );
+							$toggle_args['input_html']['data-' . $data_key] = $data_value . ( substr( $data_value, -1 ) === '-' ? $field['id'] : '' );
 						}
 
 						?>

classes/helpers/FrmFieldsHelper.php

Spacing +49 added lines, -49 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 );
@@ -695,7 +695,7 @@ 
 			'inside_class' => 'inside',
 			'close-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';
 	}
@@ -933,7 +933,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;
@@ -943,7 +943,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 );
@@ -961,7 +961,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;
 			}
@@ -1039,8 +1039,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' ) {
@@ -1264,8 +1264,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' ) );
@@ -1307,7 +1307,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 );
 		}
@@ -1340,7 +1340,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'];
@@ -1356,25 +1356,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;
@@ -1384,8 +1384,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 {
 			/**
@@ -1397,8 +1397,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
@@ -1606,11 +1606,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 );
 				}
 			}
@@ -1639,8 +1639,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;
@@ -1988,7 +1988,7 @@ 
 			$countries['class'] = 'frm-countries-opts';
 		}
 
-		$prepop[ __( 'Countries', 'formidable' ) ] = $countries;
+		$prepop[__( 'Countries', 'formidable' )] = $countries;
 
 		// State abv.
 		$states    = self::get_us_states();
@@ -1998,7 +1998,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 );
@@ -2007,7 +2007,7 @@ 
 			$states['class'] = 'frm-states-opts';
 		}
 
-		$prepop[ __( 'U.S. States', 'formidable' ) ] = $states;
+		$prepop[__( 'U.S. States', 'formidable' )] = $states;
 		unset( $state_abv, $states );
 
 		// Age.
@@ -2025,7 +2025,7 @@ 
 			$ages['class'] = 'frm-age-opts';
 		}
 
-		$prepop[ __( 'Age', 'formidable' ) ] = $ages;
+		$prepop[__( 'Age', 'formidable' )] = $ages;
 
 		// Satisfaction.
 		$satisfaction = array(
@@ -2040,7 +2040,7 @@ 
 			$satisfaction['class'] = 'frm-satisfaction-opts';
 		}
 
-		$prepop[ __( 'Satisfaction', 'formidable' ) ] = $satisfaction;
+		$prepop[__( 'Satisfaction', 'formidable' )] = $satisfaction;
 
 		// Importance.
 		$importance = array(
@@ -2055,7 +2055,7 @@ 
 			$importance['class'] = 'frm-importance-opts';
 		}
 
-		$prepop[ __( 'Importance', 'formidable' ) ] = $importance;
+		$prepop[__( 'Importance', 'formidable' )] = $importance;
 
 		// Agreement.
 		$agreement = array(
@@ -2070,7 +2070,7 @@ 
 			$agreement['class'] = 'frm-agreement-opts';
 		}
 
-		$prepop[ __( 'Agreement', 'formidable' ) ] = $agreement;
+		$prepop[__( 'Agreement', 'formidable' )] = $agreement;
 
 		// Likely.
 		$likely = array(
@@ -2085,7 +2085,7 @@ 
 			$likely['class'] = 'frm-likely-opts';
 		}
 
-		$prepop[ __( 'Likely', 'formidable' ) ] = $likely;
+		$prepop[__( 'Likely', 'formidable' )] = $likely;
 
 		$prepop = apply_filters( 'frm_bulk_field_choices', $prepop );
 	}
@@ -2306,16 +2306,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 );
 			}
 		}
 	}
@@ -2336,8 +2336,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];
 			}
 		}
 
@@ -2403,7 +2403,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'] );
 			}