Strategy11 / formidable-forms

classes/models/FrmForm.php

Spacing +21 added lines, -21 removed lines

@@ -209,7 +209,7 @@ 
 			}
 
 			if ( $new_val !== $value ) {
-				$new_values[ $key ] = $new_val;
+				$new_values[$key] = $new_val;
 			}
 		}
 
@@ -240,7 +240,7 @@ 
 
 		foreach ( $values as $value_key => $value ) {
 			if ( $value_key && in_array( $value_key, $form_fields ) ) {
-				$new_values[ $value_key ] = $value;
+				$new_values[$value_key] = $value;
 			}
 		}
 
@@ -328,15 +328,15 @@ 
 		$existing_keys = array_keys( $values['item_meta'] );
 		foreach ( $all_fields as $fid ) {
 			if ( ! in_array( $fid->id, $existing_keys ) && ( isset( $values['frm_fields_submitted'] ) && in_array( $fid->id, $values['frm_fields_submitted'] ) ) || isset( $values['options'] ) ) {
-				$values['item_meta'][ $fid->id ] = '';
+				$values['item_meta'][$fid->id] = '';
 			}
-			$field_array[ $fid->id ] = $fid;
+			$field_array[$fid->id] = $fid;
 		}
 		unset( $all_fields );
 
 		foreach ( $values['item_meta'] as $field_id => $default_value ) {
-			if ( isset( $field_array[ $field_id ] ) ) {
-				$field = $field_array[ $field_id ];
+			if ( isset( $field_array[$field_id] ) ) {
+				$field = $field_array[$field_id];
 			} else {
 				$field = FrmField::getOne( $field_id );
 			}
@@ -345,7 +345,7 @@ 
 				continue;
 			}
 
-			$is_settings_page = ( isset( $values['options'] ) || isset( $values['field_options'][ 'custom_html_' . $field_id ] ) );
+			$is_settings_page = ( isset( $values['options'] ) || isset( $values['field_options']['custom_html_' . $field_id] ) );
 			if ( $is_settings_page ) {
 				self::get_settings_page_html( $values, $field );
 
@@ -360,15 +360,15 @@ 
 			$update_options = apply_filters( 'frm_field_options_to_update', $update_options );
 
 			foreach ( $update_options as $opt => $default ) {
-				$field->field_options[ $opt ] = isset( $values['field_options'][ $opt . '_' . $field_id ] ) ? $values['field_options'][ $opt . '_' . $field_id ] : $default;
-				self::sanitize_field_opt( $opt, $field->field_options[ $opt ] );
+				$field->field_options[$opt] = isset( $values['field_options'][$opt . '_' . $field_id] ) ? $values['field_options'][$opt . '_' . $field_id] : $default;
+				self::sanitize_field_opt( $opt, $field->field_options[$opt] );
 			}
 
 			$field->field_options = apply_filters( 'frm_update_field_options', $field->field_options, $field, $values );
 
 			$new_field = array(
 				'field_options' => $field->field_options,
-				'default_value' => isset( $values[ 'default_value_' . $field_id ] ) ? FrmAppHelper::maybe_json_encode( $values[ 'default_value_' . $field_id ] ) : '',
+				'default_value' => isset( $values['default_value_' . $field_id] ) ? FrmAppHelper::maybe_json_encode( $values['default_value_' . $field_id] ) : '',
 			);
 
 			self::prepare_field_update_values( $field, $values, $new_field );
@@ -430,11 +430,11 @@ 
 	 * Updating the settings page
 	 */
 	private static function get_settings_page_html( $values, &$field ) {
-		if ( isset( $values['field_options'][ 'custom_html_' . $field->id ] ) ) {
+		if ( isset( $values['field_options']['custom_html_' . $field->id] ) ) {
 			$prev_opts     = array();
 			$fallback_html = isset( $field->field_options['custom_html'] ) ? $field->field_options['custom_html'] : FrmFieldsHelper::get_default_html( $field->type );
 
-			$field->field_options['custom_html'] = isset( $values['field_options'][ 'custom_html_' . $field->id ] ) ? $values['field_options'][ 'custom_html_' . $field->id ] : $fallback_html;
+			$field->field_options['custom_html'] = isset( $values['field_options']['custom_html_' . $field->id] ) ? $values['field_options']['custom_html_' . $field->id] : $fallback_html;
 		} elseif ( $field->type == 'hidden' || $field->type == 'user_id' ) {
 			$prev_opts = $field->field_options;
 		}
@@ -460,7 +460,7 @@ 
 		foreach ( $field_cols as $col => $default ) {
 			$default = ( $default === '' ) ? $field->{$col} : $default;
 
-			$new_field[ $col ] = isset( $values['field_options'][ $col . '_' . $field->id ] ) ? $values['field_options'][ $col . '_' . $field->id ] : $default;
+			$new_field[$col] = isset( $values['field_options'][$col . '_' . $field->id] ) ? $values['field_options'][$col . '_' . $field->id] : $default;
 		}
 
 		// Don't save the template option.
@@ -874,8 +874,8 @@ 
 			self::maybe_get_form( $form );
 		}
 
-		if ( isset( $frm_vars['form_params'] ) && is_array( $frm_vars['form_params'] ) && isset( $frm_vars['form_params'][ $form->id ] ) ) {
-			return $frm_vars['form_params'][ $form->id ];
+		if ( isset( $frm_vars['form_params'] ) && is_array( $frm_vars['form_params'] ) && isset( $frm_vars['form_params'][$form->id] ) ) {
+			return $frm_vars['form_params'][$form->id];
 		}
 
 		$action_var = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action'; // phpcs:ignore WordPress.Security.NonceVerification.Missing
@@ -904,15 +904,15 @@ 
 			//if there are two forms on the same page, make sure not to submit both
 			foreach ( $default_values as $var => $default ) {
 				if ( $var == 'action' ) {
-					$values[ $var ] = FrmAppHelper::get_param( $action_var, $default, 'get', 'sanitize_title' );
+					$values[$var] = FrmAppHelper::get_param( $action_var, $default, 'get', 'sanitize_title' );
 				} else {
-					$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
+					$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
 				}
 				unset( $var, $default );
 			}
 		} else {
 			foreach ( $default_values as $var => $default ) {
-				$values[ $var ] = $default;
+				$values[$var] = $default;
 				unset( $var, $default );
 			}
 		}
@@ -938,7 +938,7 @@ 
 			'sdir'     => '',
 		);
 		foreach ( $defaults as $var => $default ) {
-			$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
+			$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
 		}
 
 		return $values;
@@ -966,7 +966,7 @@ 
 			'keep_post' => '',
 		);
 		foreach ( $defaults as $var => $default ) {
-			$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
+			$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
 		}
 
 		return $values;
@@ -1069,7 +1069,7 @@ 
 		$form = $atts['form'];
 		$default = isset( $atts['default'] ) ? $atts['default'] : '';
 
-		return isset( $form->options[ $atts['option'] ] ) ? $form->options[ $atts['option'] ] : $default;
+		return isset( $form->options[$atts['option']] ) ? $form->options[$atts['option']] : $default;
 	}
 
 	/**

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'              => '',
@@ -946,7 +946,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;
@@ -955,7 +955,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'] ) . '"';
 		}
@@ -971,8 +971,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 );
@@ -1023,7 +1023,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' => '',
@@ -1074,7 +1074,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 {
@@ -1149,11 +1149,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;
 	}
 
@@ -1178,7 +1178,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 ) {
@@ -1210,8 +1210,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 );
@@ -1280,8 +1280,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];
 			}
 		}