Completed
Pull Request — master (#2085)
by
unknown
41s
created
classes/models/FrmForm.php 1 patch
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
 			}
210 210
 
211 211
 			if ( $new_val !== $value ) {
212
-				$new_values[ $key ] = $new_val;
212
+				$new_values[$key] = $new_val;
213 213
 			}
214 214
 		}//end foreach
215 215
 
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
 
241 241
 		foreach ( $values as $value_key => $value ) {
242 242
 			if ( $value_key && in_array( $value_key, $form_fields ) ) {
243
-				$new_values[ $value_key ] = $value;
243
+				$new_values[$value_key] = $value;
244 244
 			}
245 245
 		}
246 246
 
@@ -323,15 +323,15 @@  discard block
 block discarded – undo
323 323
 		$existing_keys = array_keys( $values['item_meta'] );
324 324
 		foreach ( $all_fields as $fid ) {
325 325
 			if ( ! in_array( $fid->id, $existing_keys ) && ( isset( $values['frm_fields_submitted'] ) && in_array( $fid->id, $values['frm_fields_submitted'] ) ) || isset( $values['options'] ) ) {
326
-				$values['item_meta'][ $fid->id ] = '';
326
+				$values['item_meta'][$fid->id] = '';
327 327
 			}
328
-			$field_array[ $fid->id ] = $fid;
328
+			$field_array[$fid->id] = $fid;
329 329
 		}
330 330
 		unset( $all_fields );
331 331
 
332 332
 		foreach ( $values['item_meta'] as $field_id => $default_value ) {
333
-			if ( isset( $field_array[ $field_id ] ) ) {
334
-				$field = $field_array[ $field_id ];
333
+			if ( isset( $field_array[$field_id] ) ) {
334
+				$field = $field_array[$field_id];
335 335
 			} else {
336 336
 				$field = FrmField::getOne( $field_id );
337 337
 			}
@@ -340,7 +340,7 @@  discard block
 block discarded – undo
340 340
 				continue;
341 341
 			}
342 342
 
343
-			$is_settings_page = ( isset( $values['options'] ) || isset( $values['field_options'][ 'custom_html_' . $field_id ] ) );
343
+			$is_settings_page = ( isset( $values['options'] ) || isset( $values['field_options']['custom_html_' . $field_id] ) );
344 344
 			if ( $is_settings_page ) {
345 345
 				self::get_settings_page_html( $values, $field );
346 346
 
@@ -356,22 +356,22 @@  discard block
 block discarded – undo
356 356
 			$update_options = apply_filters( 'frm_field_options_to_update', $update_options );
357 357
 
358 358
 			foreach ( $update_options as $opt => $default ) {
359
-				$field->field_options[ $opt ] = isset( $values['field_options'][ $opt . '_' . $field_id ] ) ? $values['field_options'][ $opt . '_' . $field_id ] : $default;
360
-				self::sanitize_field_opt( $opt, $field->field_options[ $opt ] );
359
+				$field->field_options[$opt] = isset( $values['field_options'][$opt . '_' . $field_id] ) ? $values['field_options'][$opt . '_' . $field_id] : $default;
360
+				self::sanitize_field_opt( $opt, $field->field_options[$opt] );
361 361
 			}
362 362
 
363 363
 			$field->field_options = apply_filters( 'frm_update_field_options', $field->field_options, $field, $values );
364 364
 
365 365
 			$new_field = array(
366 366
 				'field_options' => $field->field_options,
367
-				'default_value' => isset( $values[ 'default_value_' . $field_id ] ) ? FrmAppHelper::maybe_json_encode( $values[ 'default_value_' . $field_id ] ) : '',
367
+				'default_value' => isset( $values['default_value_' . $field_id] ) ? FrmAppHelper::maybe_json_encode( $values['default_value_' . $field_id] ) : '',
368 368
 			);
369 369
 
370
-			if ( ! FrmAppHelper::allow_unfiltered_html() && isset( $values['field_options'][ 'options_' . $field_id ] ) && is_array( $values['field_options'][ 'options_' . $field_id ] ) ) {
371
-				foreach ( $values['field_options'][ 'options_' . $field_id ] as $option_key => $option ) {
370
+			if ( ! FrmAppHelper::allow_unfiltered_html() && isset( $values['field_options']['options_' . $field_id] ) && is_array( $values['field_options']['options_' . $field_id] ) ) {
371
+				foreach ( $values['field_options']['options_' . $field_id] as $option_key => $option ) {
372 372
 					if ( is_array( $option ) ) {
373 373
 						foreach ( $option as $key => $item ) {
374
-							$values['field_options'][ 'options_' . $field_id ][ $option_key ][ $key ] = FrmAppHelper::kses( $item, 'all' );
374
+							$values['field_options']['options_' . $field_id][$option_key][$key] = FrmAppHelper::kses( $item, 'all' );
375 375
 						}
376 376
 					}
377 377
 				}
@@ -401,8 +401,8 @@  discard block
 block discarded – undo
401 401
 	 */
402 402
 	private static function maybe_update_max_option( $field, $values, &$new_field ) {
403 403
 		if ( $field->type === 'textarea' &&
404
-			! empty( $values['field_options'][ 'type_' . $field->id ] ) &&
405
-			in_array( $values['field_options'][ 'type_' . $field->id ], array( 'text', 'email', 'url', 'password', 'phone' ), true ) ) {
404
+			! empty( $values['field_options']['type_' . $field->id] ) &&
405
+			in_array( $values['field_options']['type_' . $field->id], array( 'text', 'email', 'url', 'password', 'phone' ), true ) ) {
406 406
 
407 407
 			$new_field['field_options']['max'] = '';
408 408
 
@@ -410,7 +410,7 @@  discard block
 block discarded – undo
410 410
 			 * Update posted field setting so that new 'max' option is displayed after form is saved and page reloads.
411 411
 			 * FrmFieldsHelper::fill_default_field_opts populates field options by calling self::get_posted_field_setting.
412 412
 			 */
413
-			$_POST['field_options'][ 'max_' . $field->id ] = '';
413
+			$_POST['field_options']['max_' . $field->id] = '';
414 414
 		}
415 415
 	}
416 416
 
@@ -486,11 +486,11 @@  discard block
 block discarded – undo
486 486
 	 * Updating the settings page
487 487
 	 */
488 488
 	private static function get_settings_page_html( $values, &$field ) {
489
-		if ( isset( $values['field_options'][ 'custom_html_' . $field->id ] ) ) {
489
+		if ( isset( $values['field_options']['custom_html_' . $field->id] ) ) {
490 490
 			$prev_opts     = array();
491 491
 			$fallback_html = isset( $field->field_options['custom_html'] ) ? $field->field_options['custom_html'] : FrmFieldsHelper::get_default_html( $field->type );
492 492
 
493
-			$field->field_options['custom_html'] = isset( $values['field_options'][ 'custom_html_' . $field->id ] ) ? $values['field_options'][ 'custom_html_' . $field->id ] : $fallback_html;
493
+			$field->field_options['custom_html'] = isset( $values['field_options']['custom_html_' . $field->id] ) ? $values['field_options']['custom_html_' . $field->id] : $fallback_html;
494 494
 		} elseif ( $field->type === 'hidden' || $field->type === 'user_id' ) {
495 495
 			$prev_opts = $field->field_options;
496 496
 		}
@@ -515,7 +515,7 @@  discard block
 block discarded – undo
515 515
 		);
516 516
 		foreach ( $field_cols as $col => $default ) {
517 517
 			$default           = $default === '' ? $field->{$col} : $default;
518
-			$new_field[ $col ] = isset( $values['field_options'][ $col . '_' . $field->id ] ) ? $values['field_options'][ $col . '_' . $field->id ] : $default;
518
+			$new_field[$col] = isset( $values['field_options'][$col . '_' . $field->id] ) ? $values['field_options'][$col . '_' . $field->id] : $default;
519 519
 		}
520 520
 
521 521
 		if ( $field->type === 'submit' && isset( $new_field['field_order'] ) && (int) $new_field['field_order'] === FrmSubmitHelper::DEFAULT_ORDER ) {
@@ -702,7 +702,7 @@  discard block
 block discarded – undo
702 702
 			if ( ! isset( $form->options['trash_time'] ) || $form->options['trash_time'] < $delete_timestamp ) {
703 703
 				self::destroy( $form->id );
704 704
 				if ( empty( $form->parent_form_id ) ) {
705
-					++$count;
705
+					++ $count;
706 706
 				}
707 707
 			}
708 708
 
@@ -925,16 +925,16 @@  discard block
 block discarded – undo
925 925
 		foreach ( $results as $row ) {
926 926
 			if ( 'trash' != $row->status ) {
927 927
 				if ( $row->is_template ) {
928
-					++$counts['template'];
928
+					++ $counts['template'];
929 929
 				} else {
930
-					++$counts['published'];
930
+					++ $counts['published'];
931 931
 				}
932 932
 			} else {
933
-				++$counts['trash'];
933
+				++ $counts['trash'];
934 934
 			}
935 935
 
936 936
 			if ( 'draft' == $row->status ) {
937
-				++$counts['draft'];
937
+				++ $counts['draft'];
938 938
 			}
939 939
 
940 940
 			unset( $row );
@@ -975,8 +975,8 @@  discard block
 block discarded – undo
975 975
 			self::maybe_get_form( $form );
976 976
 		}
977 977
 
978
-		if ( isset( $frm_vars['form_params'] ) && is_array( $frm_vars['form_params'] ) && isset( $frm_vars['form_params'][ $form->id ] ) ) {
979
-			return $frm_vars['form_params'][ $form->id ];
978
+		if ( isset( $frm_vars['form_params'] ) && is_array( $frm_vars['form_params'] ) && isset( $frm_vars['form_params'][$form->id] ) ) {
979
+			return $frm_vars['form_params'][$form->id];
980 980
 		}
981 981
 
982 982
 		$action_var = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action'; // phpcs:ignore WordPress.Security.NonceVerification.Missing
@@ -1005,15 +1005,15 @@  discard block
 block discarded – undo
1005 1005
 			// If there are two forms on the same page, make sure not to submit both.
1006 1006
 			foreach ( $default_values as $var => $default ) {
1007 1007
 				if ( $var === 'action' ) {
1008
-					$values[ $var ] = FrmAppHelper::get_param( $action_var, $default, 'get', 'sanitize_title' );
1008
+					$values[$var] = FrmAppHelper::get_param( $action_var, $default, 'get', 'sanitize_title' );
1009 1009
 				} else {
1010
-					$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
1010
+					$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
1011 1011
 				}
1012 1012
 				unset( $var, $default );
1013 1013
 			}
1014 1014
 		} else {
1015 1015
 			foreach ( $default_values as $var => $default ) {
1016
-				$values[ $var ] = $default;
1016
+				$values[$var] = $default;
1017 1017
 				unset( $var, $default );
1018 1018
 			}
1019 1019
 		}
@@ -1039,7 +1039,7 @@  discard block
 block discarded – undo
1039 1039
 			'sdir'     => '',
1040 1040
 		);
1041 1041
 		foreach ( $defaults as $var => $default ) {
1042
-			$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
1042
+			$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
1043 1043
 		}
1044 1044
 
1045 1045
 		return $values;
@@ -1067,7 +1067,7 @@  discard block
 block discarded – undo
1067 1067
 			'keep_post' => '',
1068 1068
 		);
1069 1069
 		foreach ( $defaults as $var => $default ) {
1070
-			$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
1070
+			$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
1071 1071
 		}
1072 1072
 
1073 1073
 		return $values;
@@ -1170,7 +1170,7 @@  discard block
 block discarded – undo
1170 1170
 		$form    = $atts['form'];
1171 1171
 		$default = isset( $atts['default'] ) ? $atts['default'] : '';
1172 1172
 
1173
-		return isset( $form->options[ $atts['option'] ] ) ? $form->options[ $atts['option'] ] : $default;
1173
+		return isset( $form->options[$atts['option']] ) ? $form->options[$atts['option']] : $default;
1174 1174
 	}
1175 1175
 
1176 1176
 	/**
Please login to merge, or discard this patch.