Strategy11 / formidable-forms

classes/models/FrmForm.php

Spacing +27 added lines, -27 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;
 			}
 		}
 
@@ -323,15 +323,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 );
 			}
@@ -340,7 +340,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 );
 
@@ -355,22 +355,22 @@ 
 			$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] ) : '',
 			);
 
-			if ( ! FrmAppHelper::allow_unfiltered_html() && isset( $values['field_options'][ 'options_' . $field_id ] ) && is_array( $values['field_options'][ 'options_' . $field_id ] ) ) {
-				foreach ( $values['field_options'][ 'options_' . $field_id ] as $option_key => $option ) {
+			if ( ! FrmAppHelper::allow_unfiltered_html() && isset( $values['field_options']['options_' . $field_id] ) && is_array( $values['field_options']['options_' . $field_id] ) ) {
+				foreach ( $values['field_options']['options_' . $field_id] as $option_key => $option ) {
 					if ( is_array( $option ) ) {
 						foreach ( $option as $key => $item ) {
-							$values['field_options'][ 'options_' . $field_id ][ $option_key ][ $key ] = FrmAppHelper::kses( $item, 'all' );
+							$values['field_options']['options_' . $field_id][$option_key][$key] = FrmAppHelper::kses( $item, 'all' );
 						}
 					}
 				}
@@ -400,8 +400,8 @@ 
 	 */
 	private static function maybe_update_max_option( $field, $values, &$new_field ) {
 		if ( $field->type === 'textarea' &&
-			! empty( $values['field_options'][ 'type_' . $field->id ] ) &&
-			in_array( $values['field_options'][ 'type_' . $field->id ], array( 'text', 'email', 'url', 'password', 'phone' ), true ) ) {
+			! empty( $values['field_options']['type_' . $field->id] ) &&
+			in_array( $values['field_options']['type_' . $field->id], array( 'text', 'email', 'url', 'password', 'phone' ), true ) ) {
 
 			$new_field['field_options']['max'] = '';
 
@@ -409,7 +409,7 @@ 
 			 * Update posted field setting so that new 'max' option is displayed after form is saved and page reloads.
 			 * FrmFieldsHelper::fill_default_field_opts populates field options by calling self::get_posted_field_setting.
 			 */
-			$_POST['field_options'][ 'max_' . $field->id ] = '';
+			$_POST['field_options']['max_' . $field->id] = '';
 		}
 	}
 
@@ -484,11 +484,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;
 		}
@@ -514,7 +514,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.
@@ -938,8 +938,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
@@ -968,15 +968,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 );
 			}
 		}
@@ -1002,7 +1002,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;
@@ -1030,7 +1030,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;
@@ -1133,7 +1133,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;
 	}
 
 	/**