Completed
Pull Request — master (#2379)
by
unknown
44s
created
classes/models/fields/FrmFieldType.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1199,9 +1199,9 @@
 block discarded – undo
1199 1199
 	}
1200 1200
 	
1201 1201
 		/**
1202
-	 * When the field is read only, does it need it include hidden fields?
1203
-	 * Checkboxes and dropdowns need this
1204
-	 */
1202
+		 * When the field is read only, does it need it include hidden fields?
1203
+		 * Checkboxes and dropdowns need this
1204
+		 */
1205 1205
 	protected function show_readonly_hidden() {
1206 1206
 		return false;
1207 1207
 	}
Please login to merge, or discard this 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_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
 	/**
@@ -1181,11 +1181,11 @@  discard block
 block discarded – undo
1181 1181
 		}
1182 1182
 
1183 1183
 		$options = array_values( $this->field['options'] );
1184
-		if ( ! isset( $options[ $opt ] ) ) {
1184
+		if ( ! isset( $options[$opt] ) ) {
1185 1185
 			return $hidden;
1186 1186
 		}
1187 1187
 
1188
-		$option = $options[ $opt ];
1188
+		$option = $options[$opt];
1189 1189
 		if ( is_array( $option ) ) {
1190 1190
 			$option = $option['value'];
1191 1191
 		}
@@ -1249,8 +1249,8 @@  discard block
 block discarded – undo
1249 1249
 		$selected = $values['field_value'];
1250 1250
 
1251 1251
 		if ( isset( $values['combo_name'] ) ) {
1252
-			$options  = $options[ $values['combo_name'] ];
1253
-			$selected = is_array( $selected ) && isset( $selected[ $values['combo_name'] ] ) ? $selected[ $values['combo_name'] ] : '';
1252
+			$options  = $options[$values['combo_name']];
1253
+			$selected = is_array( $selected ) && isset( $selected[$values['combo_name']] ) ? $selected[$values['combo_name']] : '';
1254 1254
 		}
1255 1255
 
1256 1256
 		$input = $this->select_tag( $values );
@@ -1305,7 +1305,7 @@  discard block
 block discarded – undo
1305 1305
 	}
1306 1306
 
1307 1307
 	protected function fill_display_field_values( $args = array() ) {
1308
-		$defaults        = array(
1308
+		$defaults = array(
1309 1309
 			'field_name'    => 'item_meta[' . $this->get_field_column( 'id' ) . ']',
1310 1310
 			'field_id'      => $this->get_field_column( 'id' ),
1311 1311
 			'field_plus_id' => '',
@@ -1362,7 +1362,7 @@  discard block
 block discarded – undo
1362 1362
 			}
1363 1363
 		}
1364 1364
 
1365
-		if ( isset( $args['errors'][ 'field' . $args['field_id'] ] ) && ! $custom_error_fields ) {
1365
+		if ( isset( $args['errors']['field' . $args['field_id']] ) && ! $custom_error_fields ) {
1366 1366
 			if ( $error_comes_first ) {
1367 1367
 				array_unshift( $describedby, 'frm_error_' . $args['html_id'] );
1368 1368
 			} else {
@@ -1440,11 +1440,11 @@  discard block
 block discarded – undo
1440 1440
 
1441 1441
 		$field_id = $this->get_field_column( 'id' );
1442 1442
 		if ( ! array_key_exists( $field_id, $frm_validated_unique_values ) ) {
1443
-			$frm_validated_unique_values[ $field_id ] = array();
1443
+			$frm_validated_unique_values[$field_id] = array();
1444 1444
 			return false;
1445 1445
 		}
1446 1446
 
1447
-		$already_validated_this_value = in_array( $value, $frm_validated_unique_values[ $field_id ], true );
1447
+		$already_validated_this_value = in_array( $value, $frm_validated_unique_values[$field_id], true );
1448 1448
 		return $already_validated_this_value;
1449 1449
 	}
1450 1450
 
@@ -1469,7 +1469,7 @@  discard block
 block discarded – undo
1469 1469
 	private function value_validated_as_unique( $value ) {
1470 1470
 		global $frm_validated_unique_values;
1471 1471
 		$field_id                                   = $this->get_field_column( 'id' );
1472
-		$frm_validated_unique_values[ $field_id ][] = $value;
1472
+		$frm_validated_unique_values[$field_id][] = $value;
1473 1473
 	}
1474 1474
 
1475 1475
 	/**
@@ -1514,8 +1514,8 @@  discard block
 block discarded – undo
1514 1514
 		$value = $this->prepare_display_value( $value, $atts );
1515 1515
 
1516 1516
 		if ( is_array( $value ) ) {
1517
-			if ( ! empty( $atts['show'] ) && isset( $value[ $atts['show'] ] ) ) {
1518
-				$value = $value[ $atts['show'] ];
1517
+			if ( ! empty( $atts['show'] ) && isset( $value[$atts['show']] ) ) {
1518
+				$value = $value[$atts['show']];
1519 1519
 			} elseif ( empty( $atts['return_array'] ) ) {
1520 1520
 				$sep   = isset( $atts['sep'] ) ? $atts['sep'] : ', ';
1521 1521
 				$value = FrmAppHelper::safe_implode( $sep, $value );
@@ -1645,8 +1645,8 @@  discard block
 block discarded – undo
1645 1645
 		$saved_entries = $atts['ids'];
1646 1646
 		$new_value     = array();
1647 1647
 		foreach ( (array) $value as $old_child_id ) {
1648
-			if ( isset( $saved_entries[ $old_child_id ] ) ) {
1649
-				$new_value[] = $saved_entries[ $old_child_id ];
1648
+			if ( isset( $saved_entries[$old_child_id] ) ) {
1649
+				$new_value[] = $saved_entries[$old_child_id];
1650 1650
 			}
1651 1651
 		}
1652 1652
 
Please login to merge, or discard this patch.