Completed
Pull Request — master (#2266)
by
unknown
40s
created
classes/models/FrmUsage.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 		);
127 127
 
128 128
 		foreach ( $skipped_keys as $skipped_key ) {
129
-			unset( $data[ $skipped_key ] );
129
+			unset( $data[$skipped_key] );
130 130
 		}
131 131
 
132 132
 		return $data;
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
 
225 225
 		foreach ( $pass_settings as $setting ) {
226 226
 			if ( isset( $settings_list->$setting ) ) {
227
-				$settings[ $setting ] = $this->maybe_json( $settings_list->$setting );
227
+				$settings[$setting] = $this->maybe_json( $settings_list->$setting );
228 228
 			}
229 229
 		}
230 230
 
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
 
261 261
 		$message_settings = array();
262 262
 		foreach ( $messages as $message ) {
263
-			$message_settings[ 'changed-' . $message ] = $settings_list->$message === $default[ $message ] ? 0 : 1;
263
+			$message_settings['changed-' . $message] = $settings_list->$message === $default[$message] ? 0 : 1;
264 264
 		}
265 265
 
266 266
 		return $message_settings;
@@ -280,7 +280,7 @@  discard block
 block discarded – undo
280 280
 
281 281
 		foreach ( $frm_roles as $frm_role => $frm_role_description ) {
282 282
 			if ( isset( $settings_list->$frm_role ) ) {
283
-				$permissions[ $frm_role ] = $settings_list->$frm_role;
283
+				$permissions[$frm_role] = $settings_list->$frm_role;
284 284
 			}
285 285
 		}
286 286
 
@@ -351,9 +351,9 @@  discard block
 block discarded – undo
351 351
 			);
352 352
 
353 353
 			foreach ( $settings as $setting ) {
354
-				if ( isset( $form->options[ $setting ] ) ) {
354
+				if ( isset( $form->options[$setting] ) ) {
355 355
 					if ( 'custom_style' === $setting ) {
356
-						$style->id = $form->options[ $setting ];
356
+						$style->id = $form->options[$setting];
357 357
 
358 358
 						if ( ! $style->id ) {
359 359
 							$style_name = 0;
@@ -364,9 +364,9 @@  discard block
 block discarded – undo
364 364
 							$style_name = $style_post ? $style_post->post_name : 'formidable-style';
365 365
 						}
366 366
 
367
-						$new_form[ $setting ] = $style_name;
367
+						$new_form[$setting] = $style_name;
368 368
 					} else {
369
-						$new_form[ $setting ] = $this->maybe_json( $form->options[ $setting ] );
369
+						$new_form[$setting] = $this->maybe_json( $form->options[$setting] );
370 370
 					}
371 371
 				}
372 372
 			}
@@ -426,7 +426,7 @@  discard block
 block discarded – undo
426 426
 		$fields = FrmDb::get_results( 'frm_fields', array(), 'id, form_id, name, type, field_options', $args );
427 427
 		foreach ( $fields as $k => $field ) {
428 428
 			FrmAppHelper::unserialize_or_decode( $field->field_options );
429
-			$fields[ $k ]->field_options = json_encode( $field->field_options );
429
+			$fields[$k]->field_options = json_encode( $field->field_options );
430 430
 		}
431 431
 		return $fields;
432 432
 	}
Please login to merge, or discard this patch.
classes/models/fields/FrmFieldType.php 1 patch
Spacing   +20 added lines, -20 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
 	/**
@@ -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 {
@@ -1411,11 +1411,11 @@  discard block
 block discarded – undo
1411 1411
 
1412 1412
 		$field_id = $this->get_field_column( 'id' );
1413 1413
 		if ( ! array_key_exists( $field_id, $frm_validated_unique_values ) ) {
1414
-			$frm_validated_unique_values[ $field_id ] = array();
1414
+			$frm_validated_unique_values[$field_id] = array();
1415 1415
 			return false;
1416 1416
 		}
1417 1417
 
1418
-		$already_validated_this_value = in_array( $value, $frm_validated_unique_values[ $field_id ], true );
1418
+		$already_validated_this_value = in_array( $value, $frm_validated_unique_values[$field_id], true );
1419 1419
 		return $already_validated_this_value;
1420 1420
 	}
1421 1421
 
@@ -1440,7 +1440,7 @@  discard block
 block discarded – undo
1440 1440
 	private function value_validated_as_unique( $value ) {
1441 1441
 		global $frm_validated_unique_values;
1442 1442
 		$field_id                                   = $this->get_field_column( 'id' );
1443
-		$frm_validated_unique_values[ $field_id ][] = $value;
1443
+		$frm_validated_unique_values[$field_id][] = $value;
1444 1444
 	}
1445 1445
 
1446 1446
 	/**
@@ -1485,8 +1485,8 @@  discard block
 block discarded – undo
1485 1485
 		$value = $this->prepare_display_value( $value, $atts );
1486 1486
 
1487 1487
 		if ( is_array( $value ) ) {
1488
-			if ( ! empty( $atts['show'] ) && isset( $value[ $atts['show'] ] ) ) {
1489
-				$value = $value[ $atts['show'] ];
1488
+			if ( ! empty( $atts['show'] ) && isset( $value[$atts['show']] ) ) {
1489
+				$value = $value[$atts['show']];
1490 1490
 			} elseif ( empty( $atts['return_array'] ) ) {
1491 1491
 				$sep   = isset( $atts['sep'] ) ? $atts['sep'] : ', ';
1492 1492
 				$value = FrmAppHelper::safe_implode( $sep, $value );
@@ -1616,8 +1616,8 @@  discard block
 block discarded – undo
1616 1616
 		$saved_entries = $atts['ids'];
1617 1617
 		$new_value     = array();
1618 1618
 		foreach ( (array) $value as $old_child_id ) {
1619
-			if ( isset( $saved_entries[ $old_child_id ] ) ) {
1620
-				$new_value[] = $saved_entries[ $old_child_id ];
1619
+			if ( isset( $saved_entries[$old_child_id] ) ) {
1620
+				$new_value[] = $saved_entries[$old_child_id];
1621 1621
 			}
1622 1622
 		}
1623 1623
 
Please login to merge, or discard this patch.
classes/helpers/FrmTipsHelper.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 			'page'  => '',
46 46
 			'class' => 'frm-mt-0',
47 47
 		);
48
-		$tip      = array_merge( $defaults, $tip );
48
+		$tip = array_merge( $defaults, $tip );
49 49
 
50 50
 		if ( isset( $tip['link'] ) && ! isset( $tip['link']['medium'] ) ) {
51 51
 			$tip['link']['medium'] = 'tip';
@@ -367,7 +367,7 @@  discard block
 block discarded – undo
367 367
 	public static function get_random_tip( $tips ) {
368 368
 		$random = rand( 0, count( $tips ) - 1 );
369 369
 
370
-		return $tips[ $random ];
370
+		return $tips[$random];
371 371
 	}
372 372
 
373 373
 	/**
Please login to merge, or discard this patch.
classes/helpers/FrmEntriesListHelper.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 				'default' => 'id',
97 97
 			)
98 98
 		);
99
-		$order   = self::get_param(
99
+		$order = self::get_param(
100 100
 			array(
101 101
 				'param'   => 'order',
102 102
 				'default' => 'DESC',
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 			$form_ids              = $this->get_form_ids( $form_id );
149 149
 			$s_query['it.form_id'] = count( $form_ids ) > 1 ? $form_ids : $form_ids[0];
150 150
 		} else {
151
-			$s_query[]          = array(
151
+			$s_query[] = array(
152 152
 				'or'               => 1,
153 153
 				'parent_form_id'   => null,
154 154
 				'parent_form_id <' => 1,
@@ -315,7 +315,7 @@  discard block
 block discarded – undo
315 315
 
316 316
 		$r = "<tr id='item-action-{$item->id}'$style>";
317 317
 
318
-		list( $columns, $hidden, , $primary ) = $this->get_column_info();
318
+		list( $columns, $hidden,, $primary ) = $this->get_column_info();
319 319
 		$action_col                           = false;
320 320
 		$action_columns                       = $this->get_action_columns();
321 321
 
Please login to merge, or discard this patch.