Completed
Pull Request — master (#2337)
by
unknown
45s
created
classes/models/fields/FrmFieldType.php 1 patch
Spacing   +21 added lines, -21 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_arrowdown6_icon', 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
 	/**
@@ -1219,8 +1219,8 @@  discard block
 block discarded – undo
1219 1219
 		$selected = $values['field_value'];
1220 1220
 
1221 1221
 		if ( isset( $values['combo_name'] ) ) {
1222
-			$options  = $options[ $values['combo_name'] ];
1223
-			$selected = is_array( $selected ) && isset( $selected[ $values['combo_name'] ] ) ? $selected[ $values['combo_name'] ] : '';
1222
+			$options  = $options[$values['combo_name']];
1223
+			$selected = is_array( $selected ) && isset( $selected[$values['combo_name']] ) ? $selected[$values['combo_name']] : '';
1224 1224
 		}
1225 1225
 
1226 1226
 		$input = $this->select_tag( $values );
@@ -1275,7 +1275,7 @@  discard block
 block discarded – undo
1275 1275
 	}
1276 1276
 
1277 1277
 	protected function fill_display_field_values( $args = array() ) {
1278
-		$defaults        = array(
1278
+		$defaults = array(
1279 1279
 			'field_name'    => 'item_meta[' . $this->get_field_column( 'id' ) . ']',
1280 1280
 			'field_id'      => $this->get_field_column( 'id' ),
1281 1281
 			'field_plus_id' => '',
@@ -1332,7 +1332,7 @@  discard block
 block discarded – undo
1332 1332
 			}
1333 1333
 		}
1334 1334
 
1335
-		if ( isset( $args['errors'][ 'field' . $args['field_id'] ] ) && ! $custom_error_fields ) {
1335
+		if ( isset( $args['errors']['field' . $args['field_id']] ) && ! $custom_error_fields ) {
1336 1336
 			if ( $error_comes_first ) {
1337 1337
 				array_unshift( $describedby, 'frm_error_' . $args['html_id'] );
1338 1338
 			} else {
@@ -1448,7 +1448,7 @@  discard block
 block discarded – undo
1448 1448
 		$values['value'] = $value;
1449 1449
 		FrmFieldsHelper::prepare_new_front_field( $values, $field_object );
1450 1450
 
1451
-		$map_callback = function ( $option ) {
1451
+		$map_callback = function( $option ) {
1452 1452
 			return is_array( $option ) ? $option['value'] : $option;
1453 1453
 		};
1454 1454
 
@@ -1499,11 +1499,11 @@  discard block
 block discarded – undo
1499 1499
 
1500 1500
 		$field_id = $this->get_field_column( 'id' );
1501 1501
 		if ( ! array_key_exists( $field_id, $frm_validated_unique_values ) ) {
1502
-			$frm_validated_unique_values[ $field_id ] = array();
1502
+			$frm_validated_unique_values[$field_id] = array();
1503 1503
 			return false;
1504 1504
 		}
1505 1505
 
1506
-		$already_validated_this_value = in_array( $value, $frm_validated_unique_values[ $field_id ], true );
1506
+		$already_validated_this_value = in_array( $value, $frm_validated_unique_values[$field_id], true );
1507 1507
 		return $already_validated_this_value;
1508 1508
 	}
1509 1509
 
@@ -1528,7 +1528,7 @@  discard block
 block discarded – undo
1528 1528
 	private function value_validated_as_unique( $value ) {
1529 1529
 		global $frm_validated_unique_values;
1530 1530
 		$field_id                                   = $this->get_field_column( 'id' );
1531
-		$frm_validated_unique_values[ $field_id ][] = $value;
1531
+		$frm_validated_unique_values[$field_id][] = $value;
1532 1532
 	}
1533 1533
 
1534 1534
 	/**
@@ -1573,8 +1573,8 @@  discard block
 block discarded – undo
1573 1573
 		$value = $this->prepare_display_value( $value, $atts );
1574 1574
 
1575 1575
 		if ( is_array( $value ) ) {
1576
-			if ( ! empty( $atts['show'] ) && isset( $value[ $atts['show'] ] ) ) {
1577
-				$value = $value[ $atts['show'] ];
1576
+			if ( ! empty( $atts['show'] ) && isset( $value[$atts['show']] ) ) {
1577
+				$value = $value[$atts['show']];
1578 1578
 			} elseif ( empty( $atts['return_array'] ) ) {
1579 1579
 				$sep   = isset( $atts['sep'] ) ? $atts['sep'] : ', ';
1580 1580
 				$value = FrmAppHelper::safe_implode( $sep, $value );
@@ -1704,8 +1704,8 @@  discard block
 block discarded – undo
1704 1704
 		$saved_entries = $atts['ids'];
1705 1705
 		$new_value     = array();
1706 1706
 		foreach ( (array) $value as $old_child_id ) {
1707
-			if ( isset( $saved_entries[ $old_child_id ] ) ) {
1708
-				$new_value[] = $saved_entries[ $old_child_id ];
1707
+			if ( isset( $saved_entries[$old_child_id] ) ) {
1708
+				$new_value[] = $saved_entries[$old_child_id];
1709 1709
 			}
1710 1710
 		}
1711 1711
 
Please login to merge, or discard this patch.