Completed
Pull Request — master (#2266)
by
unknown
49s
created
classes/views/frm-forms/add_field_links.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -76,10 +76,10 @@
 block discarded – undo
76 76
 								foreach ( $pro_fields as $field_key => $field_type ) {
77 77
 
78 78
 									if ( isset( $field_type['section'] ) ) {
79
-										if ( ! isset( $field_sections[ $field_type['section'] ] ) ) {
80
-											$field_sections[ $field_type['section'] ] = array();
79
+										if ( ! isset( $field_sections[$field_type['section']] ) ) {
80
+											$field_sections[$field_type['section']] = array();
81 81
 										}
82
-										$field_sections[ $field_type['section'] ][ $field_key ] = $field_type;
82
+										$field_sections[$field_type['section']][$field_key] = $field_type;
83 83
 										continue;
84 84
 									}
85 85
 
Please login to merge, or discard this patch.
classes/models/fields/FrmFieldType.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -156,8 +156,8 @@  discard block
 block discarded – undo
156 156
 		$field_val = '';
157 157
 		if ( is_object( $this->field ) ) {
158 158
 			$field_val = $this->field->{$column};
159
-		} elseif ( is_array( $this->field ) && isset( $this->field[ $column ] ) ) {
160
-			$field_val = $this->field[ $column ];
159
+		} elseif ( is_array( $this->field ) && isset( $this->field[$column] ) ) {
160
+			$field_val = $this->field[$column];
161 161
 		}
162 162
 
163 163
 		return $field_val;
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 		if ( is_object( $this->field ) ) {
172 172
 			$this->field->{$column} = $value;
173 173
 		} elseif ( is_array( $this->field ) ) {
174
-			$this->field[ $column ] = $value;
174
+			$this->field[$column] = $value;
175 175
 		}
176 176
 	}
177 177
 
@@ -637,7 +637,7 @@  discard block
 block discarded – undo
637 637
 			printf(
638 638
 				/* translators: %s: Field type */
639 639
 				esc_html__( '%s Options', 'formidable' ),
640
-				esc_html( $all_field_types[ $args['display']['type'] ]['name'] )
640
+				esc_html( $all_field_types[$args['display']['type']]['name'] )
641 641
 			);
642 642
 			FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown8_icon frm_svg13', array( 'aria-hidden' => 'true' ) );
643 643
 			?>
@@ -737,7 +737,7 @@  discard block
 block discarded – undo
737 737
 	 * New field
738 738
 	 */
739 739
 	public function get_new_field_defaults() {
740
-		$field        = array(
740
+		$field = array(
741 741
 			'name'          => $this->get_new_field_name(),
742 742
 			'description'   => '',
743 743
 			'type'          => $this->type,
@@ -768,8 +768,8 @@  discard block
 block discarded – undo
768 768
 
769 769
 		$fields = array_merge( $fields, $pro_fields );
770 770
 
771
-		if ( isset( $fields[ $this->type ] ) ) {
772
-			$name = is_array( $fields[ $this->type ] ) ? $fields[ $this->type ]['name'] : $fields[ $this->type ];
771
+		if ( isset( $fields[$this->type] ) ) {
772
+			$name = is_array( $fields[$this->type] ) ? $fields[$this->type]['name'] : $fields[$this->type];
773 773
 		}
774 774
 
775 775
 		return $name;
@@ -786,7 +786,7 @@  discard block
 block discarded – undo
786 786
 	 * @return array
787 787
 	 */
788 788
 	public function get_default_field_options() {
789
-		$opts        = array(
789
+		$opts = array(
790 790
 			'size'               => '',
791 791
 			'max'                => '',
792 792
 			'label'              => '',
@@ -1030,7 +1030,7 @@  discard block
 block discarded – undo
1030 1030
 	 * @return void
1031 1031
 	 */
1032 1032
 	public function set_aria_invalid_error( &$shortcode_atts, $args ) {
1033
-		$shortcode_atts['aria-invalid'] = isset( $args['errors'][ 'field' . $this->field_id ] ) ? 'true' : 'false';
1033
+		$shortcode_atts['aria-invalid'] = isset( $args['errors']['field' . $this->field_id] ) ? 'true' : 'false';
1034 1034
 	}
1035 1035
 
1036 1036
 	/**
@@ -1190,11 +1190,11 @@  discard block
 block discarded – undo
1190 1190
 		}
1191 1191
 
1192 1192
 		$options = array_values( $this->field['options'] );
1193
-		if ( ! isset( $options[ $opt ] ) ) {
1193
+		if ( ! isset( $options[$opt] ) ) {
1194 1194
 			return $hidden;
1195 1195
 		}
1196 1196
 
1197
-		$option = $options[ $opt ];
1197
+		$option = $options[$opt];
1198 1198
 		if ( is_array( $option ) ) {
1199 1199
 			$option = $option['value'];
1200 1200
 		}
@@ -1258,8 +1258,8 @@  discard block
 block discarded – undo
1258 1258
 		$selected = $values['field_value'];
1259 1259
 
1260 1260
 		if ( isset( $values['combo_name'] ) ) {
1261
-			$options  = $options[ $values['combo_name'] ];
1262
-			$selected = is_array( $selected ) && isset( $selected[ $values['combo_name'] ] ) ? $selected[ $values['combo_name'] ] : '';
1261
+			$options  = $options[$values['combo_name']];
1262
+			$selected = is_array( $selected ) && isset( $selected[$values['combo_name']] ) ? $selected[$values['combo_name']] : '';
1263 1263
 		}
1264 1264
 
1265 1265
 		$input = $this->select_tag( $values );
@@ -1314,7 +1314,7 @@  discard block
 block discarded – undo
1314 1314
 	}
1315 1315
 
1316 1316
 	protected function fill_display_field_values( $args = array() ) {
1317
-		$defaults        = array(
1317
+		$defaults = array(
1318 1318
 			'field_name'    => 'item_meta[' . $this->get_field_column( 'id' ) . ']',
1319 1319
 			'field_id'      => $this->get_field_column( 'id' ),
1320 1320
 			'field_plus_id' => '',
@@ -1371,7 +1371,7 @@  discard block
 block discarded – undo
1371 1371
 			}
1372 1372
 		}
1373 1373
 
1374
-		if ( isset( $args['errors'][ 'field' . $args['field_id'] ] ) && ! $custom_error_fields ) {
1374
+		if ( isset( $args['errors']['field' . $args['field_id']] ) && ! $custom_error_fields ) {
1375 1375
 			if ( $error_comes_first ) {
1376 1376
 				array_unshift( $describedby, 'frm_error_' . $args['html_id'] );
1377 1377
 			} else {
@@ -1449,11 +1449,11 @@  discard block
 block discarded – undo
1449 1449
 
1450 1450
 		$field_id = $this->get_field_column( 'id' );
1451 1451
 		if ( ! array_key_exists( $field_id, $frm_validated_unique_values ) ) {
1452
-			$frm_validated_unique_values[ $field_id ] = array();
1452
+			$frm_validated_unique_values[$field_id] = array();
1453 1453
 			return false;
1454 1454
 		}
1455 1455
 
1456
-		$already_validated_this_value = in_array( $value, $frm_validated_unique_values[ $field_id ], true );
1456
+		$already_validated_this_value = in_array( $value, $frm_validated_unique_values[$field_id], true );
1457 1457
 		return $already_validated_this_value;
1458 1458
 	}
1459 1459
 
@@ -1478,7 +1478,7 @@  discard block
 block discarded – undo
1478 1478
 	private function value_validated_as_unique( $value ) {
1479 1479
 		global $frm_validated_unique_values;
1480 1480
 		$field_id                                   = $this->get_field_column( 'id' );
1481
-		$frm_validated_unique_values[ $field_id ][] = $value;
1481
+		$frm_validated_unique_values[$field_id][] = $value;
1482 1482
 	}
1483 1483
 
1484 1484
 	/**
@@ -1523,8 +1523,8 @@  discard block
 block discarded – undo
1523 1523
 		$value = $this->prepare_display_value( $value, $atts );
1524 1524
 
1525 1525
 		if ( is_array( $value ) ) {
1526
-			if ( ! empty( $atts['show'] ) && isset( $value[ $atts['show'] ] ) ) {
1527
-				$value = $value[ $atts['show'] ];
1526
+			if ( ! empty( $atts['show'] ) && isset( $value[$atts['show']] ) ) {
1527
+				$value = $value[$atts['show']];
1528 1528
 			} elseif ( empty( $atts['return_array'] ) ) {
1529 1529
 				$sep   = isset( $atts['sep'] ) ? $atts['sep'] : ', ';
1530 1530
 				$value = FrmAppHelper::safe_implode( $sep, $value );
@@ -1654,8 +1654,8 @@  discard block
 block discarded – undo
1654 1654
 		$saved_entries = $atts['ids'];
1655 1655
 		$new_value     = array();
1656 1656
 		foreach ( (array) $value as $old_child_id ) {
1657
-			if ( isset( $saved_entries[ $old_child_id ] ) ) {
1658
-				$new_value[] = $saved_entries[ $old_child_id ];
1657
+			if ( isset( $saved_entries[$old_child_id] ) ) {
1658
+				$new_value[] = $saved_entries[$old_child_id];
1659 1659
 			}
1660 1660
 		}
1661 1661
 
Please login to merge, or discard this patch.
classes/views/frm-fields/back-end/settings.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -197,7 +197,7 @@
 block discarded – undo
197 197
 						);
198 198
 
199 199
 						foreach ( $default_value_type['data'] as $data_key => $data_value ) {
200
-							$toggle_args['input_html'][ 'data-' . $data_key ] = $data_value . ( substr( $data_value, -1 ) === '-' ? $field['id'] : '' );
200
+							$toggle_args['input_html']['data-' . $data_key] = $data_value . ( substr( $data_value, -1 ) === '-' ? $field['id'] : '' );
201 201
 						}
202 202
 
203 203
 						?>
Please login to merge, or discard this patch.
classes/helpers/FrmFieldsHelper.php 1 patch
Spacing   +49 added lines, -49 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 			if ( in_array( $type, array( 'data', 'lookup' ), true ) ) {
39 39
 				$values['field_options']['data_type'] = $setting;
40 40
 			} else {
41
-				$values['field_options'][ $setting ] = 1;
41
+				$values['field_options'][$setting] = 1;
42 42
 			}
43 43
 		}
44 44
 
@@ -172,10 +172,10 @@  discard block
 block discarded – undo
172 172
 		}
173 173
 
174 174
 		foreach ( $defaults as $opt => $default ) {
175
-			$values[ $opt ] = isset( $field->field_options[ $opt ] ) ? $field->field_options[ $opt ] : $default;
175
+			$values[$opt] = isset( $field->field_options[$opt] ) ? $field->field_options[$opt] : $default;
176 176
 
177 177
 			if ( $check_post ) {
178
-				self::get_posted_field_setting( $opt . '_' . $field->id, $values[ $opt ] );
178
+				self::get_posted_field_setting( $opt . '_' . $field->id, $values[$opt] );
179 179
 			}
180 180
 		}
181 181
 	}
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
 			return self::$context_is_safe_to_load_field_options_from_request_data;
193 193
 		}
194 194
 
195
-		$function = function () {
195
+		$function = function() {
196 196
 			if ( ! FrmAppHelper::is_admin_page() ) {
197 197
 				return false;
198 198
 			}
@@ -300,12 +300,12 @@  discard block
 block discarded – undo
300 300
 	 * @param mixed  $value
301 301
 	 */
302 302
 	private static function get_posted_field_setting( $setting, &$value ) {
303
-		if ( ! isset( $_POST['field_options'][ $setting ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
303
+		if ( ! isset( $_POST['field_options'][$setting] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
304 304
 			return;
305 305
 		}
306 306
 
307 307
 		if ( strpos( $setting, 'html' ) !== false ) {
308
-			$value = wp_unslash( $_POST['field_options'][ $setting ] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
308
+			$value = wp_unslash( $_POST['field_options'][$setting] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
309 309
 
310 310
 			// Conditionally strip script tags if the user sending $_POST data is not allowed to use unfiltered HTML.
311 311
 			if ( ! FrmAppHelper::allow_unfiltered_html() ) {
@@ -313,9 +313,9 @@  discard block
 block discarded – undo
313 313
 			}
314 314
 		} elseif ( strpos( $setting, 'format_' ) === 0 ) {
315 315
 			// TODO: Remove stripslashes on output, and use on input only.
316
-			$value = sanitize_text_field( $_POST['field_options'][ $setting ] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.MissingUnslash, WordPress.Security.NonceVerification.Missing
316
+			$value = sanitize_text_field( $_POST['field_options'][$setting] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.MissingUnslash, WordPress.Security.NonceVerification.Missing
317 317
 		} else {
318
-			$value = wp_unslash( $_POST['field_options'][ $setting ] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
318
+			$value = wp_unslash( $_POST['field_options'][$setting] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
319 319
 			FrmAppHelper::sanitize_value( 'wp_kses_post', $value );
320 320
 		}
321 321
 	}
@@ -388,7 +388,7 @@  discard block
 block discarded – undo
388 388
 		$values['default_value'] = FrmAppHelper::maybe_json_encode( $field->default_value );
389 389
 
390 390
 		foreach ( array( 'name', 'description', 'type', 'field_order', 'field_options', 'required' ) as $col ) {
391
-			$values[ $col ] = $field->{$col};
391
+			$values[$col] = $field->{$col};
392 392
 		}
393 393
 	}
394 394
 
@@ -426,7 +426,7 @@  discard block
 block discarded – undo
426 426
 		);
427 427
 
428 428
 		$msg = FrmField::get_option( $field, $error );
429
-		$msg = empty( $msg ) ? $defaults[ $error ]['part'] : $msg;
429
+		$msg = empty( $msg ) ? $defaults[$error]['part'] : $msg;
430 430
 		$msg = do_shortcode( $msg );
431 431
 
432 432
 		$msg = self::maybe_replace_substrings_with_field_name( $msg, $error, $field );
@@ -695,7 +695,7 @@  discard block
 block discarded – undo
695 695
 			'inside_class' => 'inside',
696 696
 			'close-icon'   => true,
697 697
 		);
698
-		$args     = array_merge( $defaults, $args );
698
+		$args = array_merge( $defaults, $args );
699 699
 
700 700
 		include FrmAppHelper::plugin_path() . '/classes/views/frm-fields/back-end/inline-modal.php';
701 701
 	}
@@ -933,7 +933,7 @@  discard block
 block discarded – undo
933 933
 				continue;
934 934
 			}
935 935
 
936
-			$atts = FrmShortcodeHelper::get_shortcode_attribute_array( $shortcodes[3][ $short_key ] );
936
+			$atts = FrmShortcodeHelper::get_shortcode_attribute_array( $shortcodes[3][$short_key] );
937 937
 			$tag  = FrmShortcodeHelper::get_shortcode_tag( $shortcodes, $short_key );
938 938
 
939 939
 			$atts['entry'] = $entry;
@@ -943,7 +943,7 @@  discard block
 block discarded – undo
943 943
 			if ( $replace_with !== null ) {
944 944
 				$replace_with = self::trigger_shortcode_atts( $replace_with, $atts );
945 945
 				self::sanitize_embedded_shortcodes( compact( 'entry' ), $replace_with );
946
-				$content = str_replace( $shortcodes[0][ $short_key ], $replace_with, $content );
946
+				$content = str_replace( $shortcodes[0][$short_key], $replace_with, $content );
947 947
 			}
948 948
 
949 949
 			unset( $atts, $replace_with );
@@ -961,7 +961,7 @@  discard block
 block discarded – undo
961 961
 		$supported_atts = array( 'remove_accents', 'sanitize', 'sanitize_url' );
962 962
 		$included_atts  = array_intersect( $supported_atts, array_keys( $atts ) );
963 963
 		foreach ( $included_atts as $included_att ) {
964
-			if ( '0' === $atts[ $included_att ] ) {
964
+			if ( '0' === $atts[$included_att] ) {
965 965
 				// Skip any option that uses 0 so sanitize_url=0 does not encode.
966 966
 				continue;
967 967
 			}
@@ -1039,8 +1039,8 @@  discard block
 block discarded – undo
1039 1039
 
1040 1040
 		$dynamic_default = array( 'admin_email', 'siteurl', 'frmurl', 'sitename', 'get', 'default-email', 'default-from-email' );
1041 1041
 
1042
-		if ( isset( $shortcode_values[ $atts['tag'] ] ) ) {
1043
-			$replace_with = $shortcode_values[ $atts['tag'] ];
1042
+		if ( isset( $shortcode_values[$atts['tag']] ) ) {
1043
+			$replace_with = $shortcode_values[$atts['tag']];
1044 1044
 		} elseif ( in_array( $atts['tag'], $dynamic_default, true ) ) {
1045 1045
 			$replace_with = self::dynamic_default_values( $atts['tag'], $atts );
1046 1046
 		} elseif ( $clean_tag === 'user_agent' ) {
@@ -1264,8 +1264,8 @@  discard block
 block discarded – undo
1264 1264
 			self::field_types_for_input( $single_input, $field_selection, $field_types );
1265 1265
 		} elseif ( in_array( $type, $multiple_input, true ) ) {
1266 1266
 			self::field_types_for_input( $multiple_input, $field_selection, $field_types );
1267
-		} elseif ( isset( $field_selection[ $type ] ) ) {
1268
-			$field_types[ $type ] = $field_selection[ $type ];
1267
+		} elseif ( isset( $field_selection[$type] ) ) {
1268
+			$field_types[$type] = $field_selection[$type];
1269 1269
 		}
1270 1270
 
1271 1271
 		$field_types = apply_filters( 'frm_switch_field_types', $field_types, compact( 'type', 'field_selection' ) );
@@ -1307,7 +1307,7 @@  discard block
 block discarded – undo
1307 1307
 		foreach ( $inputs as $input ) {
1308 1308
 			// This may not be set if a field type was removed using the frm_available_fields or frm_pro_available_fields filters.
1309 1309
 			if ( array_key_exists( $input, $fields ) ) {
1310
-				$field_types[ $input ] = $fields[ $input ];
1310
+				$field_types[$input] = $fields[$input];
1311 1311
 			}
1312 1312
 			unset( $input );
1313 1313
 		}
@@ -1340,7 +1340,7 @@  discard block
 block discarded – undo
1340 1340
 			'parent'  => false,
1341 1341
 			'pointer' => false,
1342 1342
 		);
1343
-		$args     = wp_parse_args( $args, $defaults );
1343
+		$args = wp_parse_args( $args, $defaults );
1344 1344
 
1345 1345
 		$opt_key   = $args['opt_key'];
1346 1346
 		$field     = $args['field'];
@@ -1356,25 +1356,25 @@  discard block
 block discarded – undo
1356 1356
 
1357 1357
 		// Check posted vals before checking saved values
1358 1358
 		// For fields inside repeating sections - note, don't check if $pointer is true because it will often be zero
1359
-		if ( $parent && isset( $_POST['item_meta'][ $parent ][ $pointer ]['other'][ $field['id'] ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
1359
+		if ( $parent && isset( $_POST['item_meta'][$parent][$pointer]['other'][$field['id']] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
1360 1360
 			if ( FrmField::is_field_with_multiple_values( $field ) ) {
1361 1361
 				// phpcs:ignore WordPress.Security.NonceVerification.Missing
1362
-				$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 ] ) ) : '';
1362
+				$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] ) ) : '';
1363 1363
 			} else {
1364
-				$other_val = sanitize_text_field( wp_unslash( $_POST['item_meta'][ $parent ][ $pointer ]['other'][ $field['id'] ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
1364
+				$other_val = sanitize_text_field( wp_unslash( $_POST['item_meta'][$parent][$pointer]['other'][$field['id']] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
1365 1365
 			}
1366 1366
 
1367 1367
 			return $other_val;
1368 1368
 		}
1369 1369
 
1370
-		if ( isset( $field['id'] ) && isset( $_POST['item_meta']['other'][ $field['id'] ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
1370
+		if ( isset( $field['id'] ) && isset( $_POST['item_meta']['other'][$field['id']] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
1371 1371
 			// For normal fields
1372 1372
 
1373 1373
 			if ( FrmField::is_field_with_multiple_values( $field ) ) {
1374 1374
 				// phpcs:ignore WordPress.Security.NonceVerification.Missing
1375
-				$other_val = isset( $_POST['item_meta']['other'][ $field['id'] ][ $opt_key ] ) ? sanitize_text_field( wp_unslash( $_POST['item_meta']['other'][ $field['id'] ][ $opt_key ] ) ) : '';
1375
+				$other_val = isset( $_POST['item_meta']['other'][$field['id']][$opt_key] ) ? sanitize_text_field( wp_unslash( $_POST['item_meta']['other'][$field['id']][$opt_key] ) ) : '';
1376 1376
 			} else {
1377
-				$other_val = sanitize_text_field( wp_unslash( $_POST['item_meta']['other'][ $field['id'] ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
1377
+				$other_val = sanitize_text_field( wp_unslash( $_POST['item_meta']['other'][$field['id']] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
1378 1378
 			}
1379 1379
 
1380 1380
 			return $other_val;
@@ -1384,8 +1384,8 @@  discard block
 block discarded – undo
1384 1384
 		if ( $field['type'] === 'checkbox' && is_array( $field['value'] ) ) {
1385 1385
 			// Check if there is an "other" val in saved value and make sure the
1386 1386
 			// "other" val is not equal to the Other checkbox option
1387
-			if ( isset( $field['value'][ $opt_key ] ) && $field['options'][ $opt_key ] != $field['value'][ $opt_key ] ) {
1388
-				$other_val = $field['value'][ $opt_key ];
1387
+			if ( isset( $field['value'][$opt_key] ) && $field['options'][$opt_key] != $field['value'][$opt_key] ) {
1388
+				$other_val = $field['value'][$opt_key];
1389 1389
 			}
1390 1390
 		} else {
1391 1391
 			/**
@@ -1397,8 +1397,8 @@  discard block
 block discarded – undo
1397 1397
 				// Multi-select dropdowns - key is not preserved
1398 1398
 				if ( is_array( $field['value'] ) ) {
1399 1399
 					$o_key = array_search( $temp_val, $field['value'] );
1400
-					if ( isset( $field['value'][ $o_key ] ) ) {
1401
-						unset( $field['value'][ $o_key ], $o_key );
1400
+					if ( isset( $field['value'][$o_key] ) ) {
1401
+						unset( $field['value'][$o_key], $o_key );
1402 1402
 					}
1403 1403
 				} elseif ( $temp_val == $field['value'] ) {
1404 1404
 					// For radio and regular dropdowns
@@ -1606,11 +1606,11 @@  discard block
 block discarded – undo
1606 1606
 			foreach ( $val as $k => $v ) {
1607 1607
 				if ( is_string( $v ) ) {
1608 1608
 					if ( 'custom_html' === $k ) {
1609
-						$val[ $k ] = self::switch_ids_except_strings( $replace, $replace_with, array( '[if description]', '[description]', '[/if description]' ), $v );
1609
+						$val[$k] = self::switch_ids_except_strings( $replace, $replace_with, array( '[if description]', '[description]', '[/if description]' ), $v );
1610 1610
 						unset( $k, $v );
1611 1611
 						continue;
1612 1612
 					}
1613
-					$val[ $k ] = str_replace( $replace, $replace_with, $v );
1613
+					$val[$k] = str_replace( $replace, $replace_with, $v );
1614 1614
 					unset( $k, $v );
1615 1615
 				}
1616 1616
 			}
@@ -1639,8 +1639,8 @@  discard block
 block discarded – undo
1639 1639
 			if ( false === $index ) {
1640 1640
 				continue;
1641 1641
 			}
1642
-			unset( $replace[ $index ] );
1643
-			unset( $replace_with[ $index ] );
1642
+			unset( $replace[$index] );
1643
+			unset( $replace_with[$index] );
1644 1644
 		}
1645 1645
 		$value = str_replace( $replace, $replace_with, $value );
1646 1646
 		return $value;
@@ -1988,7 +1988,7 @@  discard block
 block discarded – undo
1988 1988
 			$countries['class'] = 'frm-countries-opts';
1989 1989
 		}
1990 1990
 
1991
-		$prepop[ __( 'Countries', 'formidable' ) ] = $countries;
1991
+		$prepop[__( 'Countries', 'formidable' )] = $countries;
1992 1992
 
1993 1993
 		// State abv.
1994 1994
 		$states    = self::get_us_states();
@@ -1998,7 +1998,7 @@  discard block
 block discarded – undo
1998 1998
 			$state_abv['class'] = 'frm-state-abv-opts';
1999 1999
 		}
2000 2000
 
2001
-		$prepop[ __( 'U.S. State Abbreviations', 'formidable' ) ] = $state_abv;
2001
+		$prepop[__( 'U.S. State Abbreviations', 'formidable' )] = $state_abv;
2002 2002
 
2003 2003
 		// States.
2004 2004
 		$states = array_values( $states );
@@ -2007,7 +2007,7 @@  discard block
 block discarded – undo
2007 2007
 			$states['class'] = 'frm-states-opts';
2008 2008
 		}
2009 2009
 
2010
-		$prepop[ __( 'U.S. States', 'formidable' ) ] = $states;
2010
+		$prepop[__( 'U.S. States', 'formidable' )] = $states;
2011 2011
 		unset( $state_abv, $states );
2012 2012
 
2013 2013
 		// Age.
@@ -2025,7 +2025,7 @@  discard block
 block discarded – undo
2025 2025
 			$ages['class'] = 'frm-age-opts';
2026 2026
 		}
2027 2027
 
2028
-		$prepop[ __( 'Age', 'formidable' ) ] = $ages;
2028
+		$prepop[__( 'Age', 'formidable' )] = $ages;
2029 2029
 
2030 2030
 		// Satisfaction.
2031 2031
 		$satisfaction = array(
@@ -2040,7 +2040,7 @@  discard block
 block discarded – undo
2040 2040
 			$satisfaction['class'] = 'frm-satisfaction-opts';
2041 2041
 		}
2042 2042
 
2043
-		$prepop[ __( 'Satisfaction', 'formidable' ) ] = $satisfaction;
2043
+		$prepop[__( 'Satisfaction', 'formidable' )] = $satisfaction;
2044 2044
 
2045 2045
 		// Importance.
2046 2046
 		$importance = array(
@@ -2055,7 +2055,7 @@  discard block
 block discarded – undo
2055 2055
 			$importance['class'] = 'frm-importance-opts';
2056 2056
 		}
2057 2057
 
2058
-		$prepop[ __( 'Importance', 'formidable' ) ] = $importance;
2058
+		$prepop[__( 'Importance', 'formidable' )] = $importance;
2059 2059
 
2060 2060
 		// Agreement.
2061 2061
 		$agreement = array(
@@ -2070,7 +2070,7 @@  discard block
 block discarded – undo
2070 2070
 			$agreement['class'] = 'frm-agreement-opts';
2071 2071
 		}
2072 2072
 
2073
-		$prepop[ __( 'Agreement', 'formidable' ) ] = $agreement;
2073
+		$prepop[__( 'Agreement', 'formidable' )] = $agreement;
2074 2074
 
2075 2075
 		// Likely.
2076 2076
 		$likely = array(
@@ -2085,7 +2085,7 @@  discard block
 block discarded – undo
2085 2085
 			$likely['class'] = 'frm-likely-opts';
2086 2086
 		}
2087 2087
 
2088
-		$prepop[ __( 'Likely', 'formidable' ) ] = $likely;
2088
+		$prepop[__( 'Likely', 'formidable' )] = $likely;
2089 2089
 
2090 2090
 		$prepop = apply_filters( 'frm_bulk_field_choices', $prepop );
2091 2091
 	}
@@ -2306,16 +2306,16 @@  discard block
 block discarded – undo
2306 2306
 	 */
2307 2307
 	private static function fill_image_setting_options( $options, &$args ) {
2308 2308
 		foreach ( $options as $key => $option ) {
2309
-			$args['options'][ $key ] = $option;
2309
+			$args['options'][$key] = $option;
2310 2310
 
2311 2311
 			if ( ! empty( $option['addon'] ) ) {
2312
-				$args['options'][ $key ]['custom_attrs'] = self::fill_image_setting_addon_link( $option );
2312
+				$args['options'][$key]['custom_attrs'] = self::fill_image_setting_addon_link( $option );
2313 2313
 			}
2314 2314
 
2315
-			unset( $args['options'][ $key ]['addon'] );
2315
+			unset( $args['options'][$key]['addon'] );
2316 2316
 			$fill = array( 'upgrade', 'message', 'content' );
2317 2317
 			foreach ( $fill as $f ) {
2318
-				unset( $args['options'][ $key ][ $f ], $f );
2318
+				unset( $args['options'][$key][$f], $f );
2319 2319
 			}
2320 2320
 		}
2321 2321
 	}
@@ -2336,8 +2336,8 @@  discard block
 block discarded – undo
2336 2336
 
2337 2337
 		$fill = array( 'upgrade', 'message', 'content' );
2338 2338
 		foreach ( $fill as $f ) {
2339
-			if ( isset( $option[ $f ] ) ) {
2340
-				$custom_attrs[ 'data-' . $f ] = $option[ $f ];
2339
+			if ( isset( $option[$f] ) ) {
2340
+				$custom_attrs['data-' . $f] = $option[$f];
2341 2341
 			}
2342 2342
 		}
2343 2343
 
@@ -2403,7 +2403,7 @@  discard block
 block discarded – undo
2403 2403
 
2404 2404
 		return array_filter(
2405 2405
 			$rows,
2406
-			function ( $row ) {
2406
+			function( $row ) {
2407 2407
 				FrmAppHelper::unserialize_or_decode( $row->field_options );
2408 2408
 				return is_array( $row->field_options ) && ! empty( $row->field_options['draft'] );
2409 2409
 			}
Please login to merge, or discard this patch.
classes/helpers/FrmAppHelper.php 1 patch
Spacing   +86 added lines, -86 removed lines patch added patch discarded remove patch
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
 			'fill'   => '#4d4d4d',
249 249
 			'orange' => '#f05a24',
250 250
 		);
251
-		$atts     = array_merge( $defaults, $atts );
251
+		$atts = array_merge( $defaults, $atts );
252 252
 
253 253
 		return '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 599.68 601.37" width="' . esc_attr( $atts['width'] ) . '" height="' . esc_attr( $atts['height'] ) . '">
254 254
 			<path fill="' . esc_attr( $atts['orange'] ) . '" d="M289.6 384h140v76h-140z"/>
@@ -536,7 +536,7 @@  discard block
 block discarded – undo
536 536
 	 * @return string
537 537
 	 */
538 538
 	public static function get_server_value( $value ) {
539
-		return isset( $_SERVER[ $value ] ) ? wp_strip_all_tags( wp_unslash( $_SERVER[ $value ] ) ) : '';
539
+		return isset( $_SERVER[$value] ) ? wp_strip_all_tags( wp_unslash( $_SERVER[$value] ) ) : '';
540 540
 	}
541 541
 
542 542
 	/**
@@ -570,7 +570,7 @@  discard block
 block discarded – undo
570 570
 		$ip         = '';
571 571
 
572 572
 		foreach ( $ip_options as $key ) {
573
-			if ( ! isset( $_SERVER[ $key ] ) ) {
573
+			if ( ! isset( $_SERVER[$key] ) ) {
574 574
 				continue;
575 575
 			}
576 576
 
@@ -639,10 +639,10 @@  discard block
 block discarded – undo
639 639
 		}
640 640
 
641 641
 		if ( $src === 'get' ) {
642
-			$value = isset( $_POST[ $param ] ) ? wp_unslash( $_POST[ $param ] ) : ( isset( $_GET[ $param ] ) ? wp_unslash( $_GET[ $param ] ) : $default ); // phpcs:ignore WordPress.Security.NonceVerification.Missing, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
643
-			if ( ! isset( $_POST[ $param ] ) && isset( $_GET[ $param ] ) && ! is_array( $value ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
642
+			$value = isset( $_POST[$param] ) ? wp_unslash( $_POST[$param] ) : ( isset( $_GET[$param] ) ? wp_unslash( $_GET[$param] ) : $default ); // phpcs:ignore WordPress.Security.NonceVerification.Missing, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
643
+			if ( ! isset( $_POST[$param] ) && isset( $_GET[$param] ) && ! is_array( $value ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
644 644
 				// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
645
-				$value = htmlspecialchars_decode( wp_unslash( $_GET[ $param ] ) );
645
+				$value = htmlspecialchars_decode( wp_unslash( $_GET[$param] ) );
646 646
 			}
647 647
 			self::sanitize_value( $sanitize, $value );
648 648
 		} else {
@@ -663,7 +663,7 @@  discard block
 block discarded – undo
663 663
 				}
664 664
 
665 665
 				$p     = trim( $p, ']' );
666
-				$value = isset( $value[ $p ] ) ? $value[ $p ] : $default;
666
+				$value = isset( $value[$p] ) ? $value[$p] : $default;
667 667
 			}
668 668
 		}
669 669
 
@@ -728,26 +728,26 @@  discard block
 block discarded – undo
728 728
 			'sanitize'   => 'sanitize_text_field',
729 729
 			'serialized' => false,
730 730
 		);
731
-		$args     = wp_parse_args( $args, $defaults );
731
+		$args = wp_parse_args( $args, $defaults );
732 732
 
733 733
 		$value = $args['default'];
734 734
 		if ( $args['type'] === 'get' ) {
735
-			if ( $_GET && isset( $_GET[ $args['param'] ] ) ) {
735
+			if ( $_GET && isset( $_GET[$args['param']] ) ) {
736 736
 				// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
737
-				$value = wp_unslash( $_GET[ $args['param'] ] );
737
+				$value = wp_unslash( $_GET[$args['param']] );
738 738
 			}
739 739
 		} elseif ( $args['type'] === 'post' ) {
740
-			if ( isset( $_POST[ $args['param'] ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
740
+			if ( isset( $_POST[$args['param']] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
741 741
 				// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
742
-				$value = wp_unslash( $_POST[ $args['param'] ] );
742
+				$value = wp_unslash( $_POST[$args['param']] );
743 743
 				if ( $args['serialized'] === true && is_serialized_string( $value ) && is_serialized( $value ) ) {
744 744
 					self::unserialize_or_decode( $value );
745 745
 				}
746 746
 			}
747
-		} elseif ( isset( $_REQUEST[ $args['param'] ] ) ) {
747
+		} elseif ( isset( $_REQUEST[$args['param']] ) ) {
748 748
 			// phpcs:ignore WordPress.Security.NonceVerification.Missing
749 749
 				// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
750
-				$value = wp_unslash( $_REQUEST[ $args['param'] ] );
750
+				$value = wp_unslash( $_REQUEST[$args['param']] );
751 751
 		}
752 752
 
753 753
 		self::sanitize_value( $args['sanitize'], $value );
@@ -794,7 +794,7 @@  discard block
 block discarded – undo
794 794
 		if ( is_array( $value ) ) {
795 795
 			$temp_values = $value;
796 796
 			foreach ( $temp_values as $k => $v ) {
797
-				self::sanitize_value( $sanitize, $value[ $k ] );
797
+				self::sanitize_value( $sanitize, $value[$k] );
798 798
 			}
799 799
 			return;
800 800
 		}
@@ -805,8 +805,8 @@  discard block
 block discarded – undo
805 805
 	public static function sanitize_request( $sanitize_method, &$values ) {
806 806
 		$temp_values = $values;
807 807
 		foreach ( $temp_values as $k => $val ) {
808
-			if ( isset( $sanitize_method[ $k ] ) ) {
809
-				$values[ $k ] = call_user_func( $sanitize_method[ $k ], $val );
808
+			if ( isset( $sanitize_method[$k] ) ) {
809
+				$values[$k] = call_user_func( $sanitize_method[$k], $val );
810 810
 			}
811 811
 		}
812 812
 	}
@@ -866,7 +866,7 @@  discard block
 block discarded – undo
866 866
 		if ( is_array( $value ) ) {
867 867
 			$temp_values = $value;
868 868
 			foreach ( $temp_values as $k => $v ) {
869
-				self::decode_specialchars( $value[ $k ] );
869
+				self::decode_specialchars( $value[$k] );
870 870
 			}
871 871
 		} else {
872 872
 			self::decode_amp( $value );
@@ -1001,7 +1001,7 @@  discard block
 block discarded – undo
1001 1001
 	 * @return array
1002 1002
 	 */
1003 1003
 	public static function add_allowed_submit_button_tags( $allowed_html ) {
1004
-		$allowed_html['input']                    = array(
1004
+		$allowed_html['input'] = array(
1005 1005
 			'type'           => true,
1006 1006
 			'value'          => true,
1007 1007
 			'formnovalidate' => true,
@@ -1024,7 +1024,7 @@  discard block
 block discarded – undo
1024 1024
 			$allowed_html = $html;
1025 1025
 		} elseif ( ! empty( $allowed ) ) {
1026 1026
 			foreach ( (array) $allowed as $a ) {
1027
-				$allowed_html[ $a ] = isset( $html[ $a ] ) ? $html[ $a ] : array();
1027
+				$allowed_html[$a] = isset( $html[$a] ) ? $html[$a] : array();
1028 1028
 			}
1029 1029
 		}
1030 1030
 
@@ -1208,8 +1208,8 @@  discard block
 block discarded – undo
1208 1208
 		}
1209 1209
 
1210 1210
 		global $wp_query;
1211
-		if ( isset( $wp_query->query_vars[ $param ] ) ) {
1212
-			$value = $wp_query->query_vars[ $param ];
1211
+		if ( isset( $wp_query->query_vars[$param] ) ) {
1212
+			$value = $wp_query->query_vars[$param];
1213 1213
 		}
1214 1214
 
1215 1215
 		return $value;
@@ -1240,9 +1240,9 @@  discard block
 block discarded – undo
1240 1240
 			'frm_keyalt_icon'       => 'frm_key_icon',
1241 1241
 			'frm_keyalt_solid_icon' => 'frm_key_solid_icon',
1242 1242
 		);
1243
-		if ( isset( $deprecated[ $icon ] ) ) {
1244
-			$icon  = $deprecated[ $icon ];
1245
-			$class = str_replace( $icon, $deprecated[ $icon ], $class );
1243
+		if ( isset( $deprecated[$icon] ) ) {
1244
+			$icon  = $deprecated[$icon];
1245
+			$class = str_replace( $icon, $deprecated[$icon], $class );
1246 1246
 		}
1247 1247
 
1248 1248
 		if ( $icon === $class ) {
@@ -1364,7 +1364,7 @@  discard block
 block discarded – undo
1364 1364
 	 * @return string|void
1365 1365
 	 */
1366 1366
 	public static function array_to_html_params( $atts, $echo = false ) {
1367
-		$callback = function () use ( $atts ) {
1367
+		$callback = function() use ( $atts ) {
1368 1368
 			if ( $atts ) {
1369 1369
 				foreach ( $atts as $key => $value ) {
1370 1370
 					echo ' ' . esc_attr( $key ) . '="' . esc_attr( $value ) . '"';
@@ -1542,7 +1542,7 @@  discard block
 block discarded – undo
1542 1542
 			'value'       => false,
1543 1543
 			'class'       => '',
1544 1544
 		);
1545
-		$atts     = array_merge( $defaults, $atts );
1545
+		$atts = array_merge( $defaults, $atts );
1546 1546
 
1547 1547
 		if ( $atts['input_id'] === 'template' && empty( $atts['tosearch'] ) ) {
1548 1548
 			$atts['tosearch'] = 'frm-card';
@@ -1618,7 +1618,7 @@  discard block
 block discarded – undo
1618 1618
 				'new_file_path' => self::plugin_path() . '/js',
1619 1619
 			)
1620 1620
 		);
1621
-		$new_file  = new FrmCreateFile( $file_atts );
1621
+		$new_file = new FrmCreateFile( $file_atts );
1622 1622
 
1623 1623
 		$files = array(
1624 1624
 			self::plugin_path() . '/js/formidable.min.js',
@@ -1832,8 +1832,8 @@  discard block
 block discarded – undo
1832 1832
 	 */
1833 1833
 	private static function get_dropdown_value_and_label_from_option( $option, $key, $args ) {
1834 1834
 		if ( is_array( $option ) ) {
1835
-			$value = isset( $option[ $args['value_key'] ] ) ? $option[ $args['value_key'] ] : '';
1836
-			$label = isset( $option[ $args['label_key'] ] ) ? $option[ $args['label_key'] ] : '';
1835
+			$value = isset( $option[$args['value_key']] ) ? $option[$args['value_key']] : '';
1836
+			$label = isset( $option[$args['label_key']] ) ? $option[$args['label_key']] : '';
1837 1837
 		} else {
1838 1838
 			$value = $key;
1839 1839
 			$label = $option;
@@ -2216,8 +2216,8 @@  discard block
 block discarded – undo
2216 2216
 			return $error;
2217 2217
 		}
2218 2218
 
2219
-		$nonce_value = $_REQUEST && isset( $_REQUEST[ $nonce_name ] ) ? sanitize_text_field( wp_unslash( $_REQUEST[ $nonce_name ] ) ) : '';
2220
-		if ( $_REQUEST && ( ! isset( $_REQUEST[ $nonce_name ] ) || ! wp_verify_nonce( $nonce_value, $nonce ) ) ) {
2219
+		$nonce_value = $_REQUEST && isset( $_REQUEST[$nonce_name] ) ? sanitize_text_field( wp_unslash( $_REQUEST[$nonce_name] ) ) : '';
2220
+		if ( $_REQUEST && ( ! isset( $_REQUEST[$nonce_name] ) || ! wp_verify_nonce( $nonce_value, $nonce ) ) ) {
2221 2221
 			$frm_settings = self::get_settings();
2222 2222
 			$error        = $frm_settings->admin_permission;
2223 2223
 		}
@@ -2253,7 +2253,7 @@  discard block
 block discarded – undo
2253 2253
 			} else {
2254 2254
 				foreach ( $value as $k => $v ) {
2255 2255
 					if ( ! is_array( $v ) ) {
2256
-						$value[ $k ] = call_user_func( $original_function, $v );
2256
+						$value[$k] = call_user_func( $original_function, $v );
2257 2257
 					}
2258 2258
 				}
2259 2259
 			}
@@ -2294,7 +2294,7 @@  discard block
 block discarded – undo
2294 2294
 			if ( is_array( $value ) ) {
2295 2295
 				$return = array_merge( $return, self::array_flatten( $value, $keys ) );
2296 2296
 			} elseif ( $keys === 'keep' ) {
2297
-					$return[ $key ] = $value;
2297
+					$return[$key] = $value;
2298 2298
 			} else {
2299 2299
 				$return[] = $value;
2300 2300
 			}
@@ -2369,11 +2369,11 @@  discard block
 block discarded – undo
2369 2369
 		}
2370 2370
 
2371 2371
 		$ver = $default;
2372
-		if ( ! isset( $wp_scripts->registered[ $handle ] ) ) {
2372
+		if ( ! isset( $wp_scripts->registered[$handle] ) ) {
2373 2373
 			return $ver;
2374 2374
 		}
2375 2375
 
2376
-		$query = $wp_scripts->registered[ $handle ];
2376
+		$query = $wp_scripts->registered[$handle];
2377 2377
 		if ( is_object( $query ) && ! empty( $query->ver ) ) {
2378 2378
 			$ver = $query->ver;
2379 2379
 		}
@@ -2389,7 +2389,7 @@  discard block
 block discarded – undo
2389 2389
 	 * @return string|null
2390 2390
 	 */
2391 2391
 	public static function js_redirect( $url, $echo = false ) {
2392
-		$callback = function () use ( $url ) {
2392
+		$callback = function() use ( $url ) {
2393 2393
 			echo '<script type="text/javascript">window.location="' . esc_url_raw( $url ) . '"</script>';
2394 2394
 		};
2395 2395
 		return self::clip( $callback, $echo );
@@ -2484,7 +2484,7 @@  discard block
 block discarded – undo
2484 2484
 			$suffix = 2;
2485 2485
 			do {
2486 2486
 				$key_check = $key . $separator . $suffix;
2487
-				++$suffix;
2487
+				++ $suffix;
2488 2488
 			} while ( in_array( $key_check, $similar_keys, true ) );
2489 2489
 
2490 2490
 			$key = $key_check;
@@ -2594,7 +2594,7 @@  discard block
 block discarded – undo
2594 2594
 
2595 2595
 		foreach ( array( 'name', 'description' ) as $var ) {
2596 2596
 			$default_val    = isset( $record->{$var} ) ? $record->{$var} : '';
2597
-			$values[ $var ] = self::get_param( $var, $default_val, 'get', 'wp_kses_post' );
2597
+			$values[$var] = self::get_param( $var, $default_val, 'get', 'wp_kses_post' );
2598 2598
 			unset( $var, $default_val );
2599 2599
 		}
2600 2600
 
@@ -2650,9 +2650,9 @@  discard block
 block discarded – undo
2650 2650
 			$meta_value = FrmEntryMeta::get_meta_value( $record, $field->id );
2651 2651
 		}//end if
2652 2652
 
2653
-		$field_type = isset( $post_values['field_options'][ 'type_' . $field->id ] ) ? $post_values['field_options'][ 'type_' . $field->id ] : $field->type;
2654
-		if ( isset( $post_values['item_meta'][ $field->id ] ) ) {
2655
-			$new_value = $post_values['item_meta'][ $field->id ];
2653
+		$field_type = isset( $post_values['field_options']['type_' . $field->id] ) ? $post_values['field_options']['type_' . $field->id] : $field->type;
2654
+		if ( isset( $post_values['item_meta'][$field->id] ) ) {
2655
+			$new_value = $post_values['item_meta'][$field->id];
2656 2656
 			self::unserialize_or_decode( $new_value );
2657 2657
 		} else {
2658 2658
 			$new_value = $meta_value;
@@ -2673,7 +2673,7 @@  discard block
 block discarded – undo
2673 2673
 
2674 2674
 		$field_array = array_merge( (array) $field->field_options, $field_array );
2675 2675
 
2676
-		$values['fields'][ $field->id ] = $field_array;
2676
+		$values['fields'][$field->id] = $field_array;
2677 2677
 	}
2678 2678
 
2679 2679
 	/**
@@ -2723,11 +2723,11 @@  discard block
 block discarded – undo
2723 2723
 		}
2724 2724
 
2725 2725
 		foreach ( $form->options as $opt => $value ) {
2726
-			if ( isset( $post_values[ $opt ] ) ) {
2727
-				$values[ $opt ] = $post_values[ $opt ];
2728
-				self::unserialize_or_decode( $values[ $opt ] );
2726
+			if ( isset( $post_values[$opt] ) ) {
2727
+				$values[$opt] = $post_values[$opt];
2728
+				self::unserialize_or_decode( $values[$opt] );
2729 2729
 			} else {
2730
-				$values[ $opt ] = $value;
2730
+				$values[$opt] = $value;
2731 2731
 			}
2732 2732
 		}
2733 2733
 
@@ -2741,8 +2741,8 @@  discard block
 block discarded – undo
2741 2741
 		$form_defaults = FrmFormsHelper::get_default_opts();
2742 2742
 
2743 2743
 		foreach ( $form_defaults as $opt => $default ) {
2744
-			if ( ! isset( $values[ $opt ] ) || $values[ $opt ] == '' ) {
2745
-				$values[ $opt ] = $post_values && isset( $post_values['options'][ $opt ] ) ? $post_values['options'][ $opt ] : $default;
2744
+			if ( ! isset( $values[$opt] ) || $values[$opt] == '' ) {
2745
+				$values[$opt] = $post_values && isset( $post_values['options'][$opt] ) ? $post_values['options'][$opt] : $default;
2746 2746
 			}
2747 2747
 
2748 2748
 			unset( $opt, $default );
@@ -2753,8 +2753,8 @@  discard block
 block discarded – undo
2753 2753
 		}
2754 2754
 
2755 2755
 		foreach ( array( 'before', 'after', 'submit' ) as $h ) {
2756
-			if ( ! isset( $values[ $h . '_html' ] ) ) {
2757
-				$values[ $h . '_html' ] = ( isset( $post_values['options'][ $h . '_html' ] ) ? $post_values['options'][ $h . '_html' ] : FrmFormsHelper::get_default_html( $h ) );
2756
+			if ( ! isset( $values[$h . '_html'] ) ) {
2757
+				$values[$h . '_html'] = ( isset( $post_values['options'][$h . '_html'] ) ? $post_values['options'][$h . '_html'] : FrmFormsHelper::get_default_html( $h ) );
2758 2758
 			}
2759 2759
 			unset( $h );
2760 2760
 		}
@@ -2949,25 +2949,25 @@  discard block
 block discarded – undo
2949 2949
 		if ( ! is_numeric( $levels ) ) {
2950 2950
 			// Show time in specified unit.
2951 2951
 			$levels = self::get_unit( $levels );
2952
-			if ( isset( $time_strings[ $levels ] ) ) {
2952
+			if ( isset( $time_strings[$levels] ) ) {
2953 2953
 				$diff         = array(
2954 2954
 					$levels => self::time_format( $levels, $diff ),
2955 2955
 				);
2956 2956
 				$time_strings = array(
2957
-					$levels => $time_strings[ $levels ],
2957
+					$levels => $time_strings[$levels],
2958 2958
 				);
2959 2959
 			}
2960 2960
 			$levels = 1;
2961 2961
 		}
2962 2962
 
2963 2963
 		foreach ( $time_strings as $k => $v ) {
2964
-			if ( isset( $diff[ $k ] ) && $diff[ $k ] ) {
2965
-				$time_strings[ $k ] = $diff[ $k ] . ' ' . ( $diff[ $k ] > 1 ? $v[1] : $v[0] );
2966
-			} elseif ( isset( $diff[ $k ] ) && count( $time_strings ) === 1 ) {
2964
+			if ( isset( $diff[$k] ) && $diff[$k] ) {
2965
+				$time_strings[$k] = $diff[$k] . ' ' . ( $diff[$k] > 1 ? $v[1] : $v[0] );
2966
+			} elseif ( isset( $diff[$k] ) && count( $time_strings ) === 1 ) {
2967 2967
 				// Account for 0.
2968
-				$time_strings[ $k ] = $diff[ $k ] . ' ' . $v[1];
2968
+				$time_strings[$k] = $diff[$k] . ' ' . $v[1];
2969 2969
 			} else {
2970
-				unset( $time_strings[ $k ] );
2970
+				unset( $time_strings[$k] );
2971 2971
 			}
2972 2972
 		}
2973 2973
 
@@ -2986,8 +2986,8 @@  discard block
 block discarded – undo
2986 2986
 			'y' => 'y',
2987 2987
 			'd' => 'days',
2988 2988
 		);
2989
-		if ( isset( $return[ $unit ] ) ) {
2990
-			return $diff[ $return[ $unit ] ];
2989
+		if ( isset( $return[$unit] ) ) {
2990
+			return $diff[$return[$unit]];
2991 2991
 		}
2992 2992
 
2993 2993
 		$total = $diff['days'] * self::convert_time( 'd', $unit );
@@ -2995,11 +2995,11 @@  discard block
 block discarded – undo
2995 2995
 		$times = array( 'h', 'i', 's' );
2996 2996
 
2997 2997
 		foreach ( $times as $time ) {
2998
-			if ( ! isset( $diff[ $time ] ) ) {
2998
+			if ( ! isset( $diff[$time] ) ) {
2999 2999
 				continue;
3000 3000
 			}
3001 3001
 
3002
-			$total += $diff[ $time ] * self::convert_time( $time, $unit );
3002
+			$total += $diff[$time] * self::convert_time( $time, $unit );
3003 3003
 		}
3004 3004
 
3005 3005
 		return floor( $total );
@@ -3019,7 +3019,7 @@  discard block
 block discarded – undo
3019 3019
 			'y' => DAY_IN_SECONDS * 365.25,
3020 3020
 		);
3021 3021
 
3022
-		return $convert[ $from ] / $convert[ $to ];
3022
+		return $convert[$from] / $convert[$to];
3023 3023
 	}
3024 3024
 
3025 3025
 	/**
@@ -3027,7 +3027,7 @@  discard block
 block discarded – undo
3027 3027
 	 */
3028 3028
 	private static function get_unit( $unit ) {
3029 3029
 		$units = self::get_time_strings();
3030
-		if ( isset( $units[ $unit ] ) || is_numeric( $unit ) ) {
3030
+		if ( isset( $units[$unit] ) || is_numeric( $unit ) ) {
3031 3031
 			return $unit;
3032 3032
 		}
3033 3033
 
@@ -3143,17 +3143,17 @@  discard block
 block discarded – undo
3143 3143
 
3144 3144
 					case 1:
3145 3145
 						$l2 = $name;
3146
-						self::add_value_to_array( $name, $l2, $this_val, $vars[ $l1 ] );
3146
+						self::add_value_to_array( $name, $l2, $this_val, $vars[$l1] );
3147 3147
 						break;
3148 3148
 
3149 3149
 					case 2:
3150 3150
 						$l3 = $name;
3151
-						self::add_value_to_array( $name, $l3, $this_val, $vars[ $l1 ][ $l2 ] );
3151
+						self::add_value_to_array( $name, $l3, $this_val, $vars[$l1][$l2] );
3152 3152
 						break;
3153 3153
 
3154 3154
 					case 3:
3155 3155
 						$l4 = $name;
3156
-						self::add_value_to_array( $name, $l4, $this_val, $vars[ $l1 ][ $l2 ][ $l3 ] );
3156
+						self::add_value_to_array( $name, $l4, $this_val, $vars[$l1][$l2][$l3] );
3157 3157
 				}
3158 3158
 
3159 3159
 				unset( $this_val, $n );
@@ -3172,8 +3172,8 @@  discard block
 block discarded – undo
3172 3172
 	public static function add_value_to_array( $name, $l1, $val, &$vars ) {
3173 3173
 		if ( $name == '' ) {
3174 3174
 			$vars[] = $val;
3175
-		} elseif ( ! isset( $vars[ $l1 ] ) ) {
3176
-			$vars[ $l1 ] = $val;
3175
+		} elseif ( ! isset( $vars[$l1] ) ) {
3176
+			$vars[$l1] = $val;
3177 3177
 		}
3178 3178
 	}
3179 3179
 
@@ -3190,7 +3190,7 @@  discard block
 block discarded – undo
3190 3190
 			'new_tab'       => __( 'This option will open the link in a new browser tab. Please note that some popup blockers may prevent this from happening, in which case the link will be displayed.', 'formidable' ),
3191 3191
 		);
3192 3192
 
3193
-		if ( ! isset( $tooltips[ $name ] ) ) {
3193
+		if ( ! isset( $tooltips[$name] ) ) {
3194 3194
 			return;
3195 3195
 		}
3196 3196
 
@@ -3200,7 +3200,7 @@  discard block
 block discarded – undo
3200 3200
 			echo ' class="frm_help"';
3201 3201
 		}
3202 3202
 
3203
-		echo ' title="' . esc_attr( $tooltips[ $name ] );
3203
+		echo ' title="' . esc_attr( $tooltips[$name] );
3204 3204
 
3205 3205
 		if ( 'open' != $class ) {
3206 3206
 			echo '"';
@@ -3259,13 +3259,13 @@  discard block
 block discarded – undo
3259 3259
 	}
3260 3260
 
3261 3261
 	private static function prepare_action_slashes( $val, $key, &$post_content ) {
3262
-		if ( ! isset( $post_content[ $key ] ) || is_numeric( $val ) ) {
3262
+		if ( ! isset( $post_content[$key] ) || is_numeric( $val ) ) {
3263 3263
 			return;
3264 3264
 		}
3265 3265
 
3266 3266
 		if ( is_array( $val ) ) {
3267 3267
 			foreach ( $val as $k1 => $v1 ) {
3268
-				self::prepare_action_slashes( $v1, $k1, $post_content[ $key ] );
3268
+				self::prepare_action_slashes( $v1, $k1, $post_content[$key] );
3269 3269
 				unset( $k1, $v1 );
3270 3270
 			}
3271 3271
 		} else {
@@ -3273,7 +3273,7 @@  discard block
 block discarded – undo
3273 3273
 			$val = stripslashes( $val );
3274 3274
 
3275 3275
 			// Add backslashes before double quotes and forward slashes only
3276
-			$post_content[ $key ] = addcslashes( $val, '"\\/' );
3276
+			$post_content[$key] = addcslashes( $val, '"\\/' );
3277 3277
 		}
3278 3278
 	}
3279 3279
 
@@ -3394,14 +3394,14 @@  discard block
 block discarded – undo
3394 3394
 				continue;
3395 3395
 			}
3396 3396
 			$key = $input['name'];
3397
-			if ( isset( $formatted[ $key ] ) ) {
3398
-				if ( is_array( $formatted[ $key ] ) ) {
3399
-					$formatted[ $key ][] = $input['value'];
3397
+			if ( isset( $formatted[$key] ) ) {
3398
+				if ( is_array( $formatted[$key] ) ) {
3399
+					$formatted[$key][] = $input['value'];
3400 3400
 				} else {
3401
-					$formatted[ $key ] = array( $formatted[ $key ], $input['value'] );
3401
+					$formatted[$key] = array( $formatted[$key], $input['value'] );
3402 3402
 				}
3403 3403
 			} else {
3404
-				$formatted[ $key ] = $input['value'];
3404
+				$formatted[$key] = $input['value'];
3405 3405
 			}
3406 3406
 		}
3407 3407
 
@@ -4103,8 +4103,8 @@  discard block
 block discarded – undo
4103 4103
 		}
4104 4104
 
4105 4105
 		foreach ( $keys as $key ) {
4106
-			if ( isset( $values[ $key ] ) ) {
4107
-				$values[ $key ] = self::kses( $values[ $key ], 'all' );
4106
+			if ( isset( $values[$key] ) ) {
4107
+				$values[$key] = self::kses( $values[$key], 'all' );
4108 4108
 			}
4109 4109
 		}
4110 4110
 
@@ -4169,7 +4169,7 @@  discard block
 block discarded – undo
4169 4169
 				'role',
4170 4170
 				'style',
4171 4171
 			);
4172
-			$safe      = in_array( $key, $safe_keys, true );
4172
+			$safe = in_array( $key, $safe_keys, true );
4173 4173
 		}//end if
4174 4174
 
4175 4175
 		/**
@@ -4308,7 +4308,7 @@  discard block
 block discarded – undo
4308 4308
 			return 0;
4309 4309
 		}
4310 4310
 
4311
-		return strlen( $parts[ count( $parts ) - 1 ] );
4311
+		return strlen( $parts[count( $parts ) - 1] );
4312 4312
 	}
4313 4313
 
4314 4314
 	/**
@@ -4328,7 +4328,7 @@  discard block
 block discarded – undo
4328 4328
 
4329 4329
 		add_filter(
4330 4330
 			'option_gmt_offset',
4331
-			function ( $offset ) {
4331
+			function( $offset ) {
4332 4332
 				if ( ! is_string( $offset ) || is_numeric( $offset ) ) {
4333 4333
 					// Leave a valid value alone.
4334 4334
 					return $offset;
@@ -4425,7 +4425,7 @@  discard block
 block discarded – undo
4425 4425
 			return;
4426 4426
 		}
4427 4427
 
4428
-		$ajax_callback = function () use ( $option ) {
4428
+		$ajax_callback = function() use ( $option ) {
4429 4429
 			self::dismiss_warning_message( $option );
4430 4430
 		};
4431 4431
 
@@ -4435,7 +4435,7 @@  discard block
 block discarded – undo
4435 4435
 
4436 4436
 		add_filter(
4437 4437
 			'frm_message_list',
4438
-			function ( $show_messages ) use ( $message, $option ) {
4438
+			function( $show_messages ) use ( $message, $option ) {
4439 4439
 				if ( get_option( $option, false ) ) {
4440 4440
 					return $show_messages;
4441 4441
 				}
Please login to merge, or discard this patch.