Completed
Pull Request — master (#2229)
by
unknown
54s
created
classes/models/fields/FrmFieldGdpr.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -172,7 +172,7 @@
 block discarded – undo
172 172
 
173 173
 			if ( ! $required && empty( $args['value'] ) ) {
174 174
 				$frm_settings                    = FrmAppHelper::get_settings();
175
-				$errors[ 'field' . $args['id'] ] = str_replace( '[field_name]', is_object( $this->field ) ? $this->field->name : $this->field['name'], $frm_settings->blank_msg );
175
+				$errors['field' . $args['id']] = str_replace( '[field_name]', is_object( $this->field ) ? $this->field->name : $this->field['name'], $frm_settings->blank_msg );
176 176
 			}
177 177
 		}
178 178
 
Please login to merge, or discard this patch.
classes/models/FrmHoneypot.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -208,7 +208,7 @@
 block discarded – undo
208 208
 			return '';
209 209
 		}
210 210
 
211
-		return isset( $item_meta[ $field_id ] ) ? $item_meta[ $field_id ] : '';
211
+		return isset( $item_meta[$field_id] ) ? $item_meta[$field_id] : '';
212 212
 	}
213 213
 
214 214
 	/**
Please login to merge, or discard this patch.
classes/models/FrmFormAction.php 1 patch
Spacing   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -208,9 +208,9 @@  discard block
 block discarded – undo
208 208
 		$groups = FrmFormActionsController::form_action_groups();
209 209
 		$group  = 'misc';
210 210
 
211
-		if ( isset( $action_options['group'] ) && isset( $groups[ $action_options['group'] ] ) ) {
211
+		if ( isset( $action_options['group'] ) && isset( $groups[$action_options['group']] ) ) {
212 212
 			$group = $action_options['group'];
213
-		} elseif ( isset( $groups[ $this->id_base ] ) ) {
213
+		} elseif ( isset( $groups[$this->id_base] ) ) {
214 214
 			$group = $this->id_base;
215 215
 		} else {
216 216
 			foreach ( $groups as $name => $check_group ) {
@@ -221,8 +221,8 @@  discard block
 block discarded – undo
221 221
 			}
222 222
 		}
223 223
 
224
-		$groups[ $group ]['id'] = $group;
225
-		return $groups[ $group ];
224
+		$groups[$group]['id'] = $group;
225
+		return $groups[$group];
226 226
 	}
227 227
 
228 228
 	/**
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
 	 * @return int $post_id
334 334
 	 */
335 335
 	public function maybe_create_action( $action, $forms ) {
336
-		if ( isset( $action['ID'] ) && is_numeric( $action['ID'] ) && isset( $forms[ $action['menu_order'] ] ) && $forms[ $action['menu_order'] ] === 'updated' ) {
336
+		if ( isset( $action['ID'] ) && is_numeric( $action['ID'] ) && isset( $forms[$action['menu_order']] ) && $forms[$action['menu_order']] === 'updated' ) {
337 337
 			// Update action only
338 338
 			$action['post_content'] = FrmAppHelper::maybe_json_decode( $action['post_content'] );
339 339
 			$post_id                = $this->save_settings( $action );
@@ -356,18 +356,18 @@  discard block
 block discarded – undo
356 356
 		$switch             = $this->get_global_switch_fields();
357 357
 
358 358
 		foreach ( (array) $action->post_content as $key => $val ) {
359
-			if ( is_numeric( $val ) && isset( $frm_duplicate_ids[ $val ] ) ) {
360
-				$action->post_content[ $key ] = $frm_duplicate_ids[ $val ];
359
+			if ( is_numeric( $val ) && isset( $frm_duplicate_ids[$val] ) ) {
360
+				$action->post_content[$key] = $frm_duplicate_ids[$val];
361 361
 			} elseif ( ! is_array( $val ) ) {
362
-				$action->post_content[ $key ] = FrmFieldsHelper::switch_field_ids( $val );
363
-			} elseif ( isset( $switch[ $key ] ) && is_array( $switch[ $key ] ) ) {
362
+				$action->post_content[$key] = FrmFieldsHelper::switch_field_ids( $val );
363
+			} elseif ( isset( $switch[$key] ) && is_array( $switch[$key] ) ) {
364 364
 				// loop through each value if empty
365
-				if ( empty( $switch[ $key ] ) ) {
366
-					$switch[ $key ] = array_keys( $val );
365
+				if ( empty( $switch[$key] ) ) {
366
+					$switch[$key] = array_keys( $val );
367 367
 				}
368 368
 
369
-				foreach ( $switch[ $key ] as $subkey ) {
370
-					$action->post_content[ $key ] = $this->duplicate_array_walk( $action->post_content[ $key ], $subkey, $val );
369
+				foreach ( $switch[$key] as $subkey ) {
370
+					$action->post_content[$key] = $this->duplicate_array_walk( $action->post_content[$key], $subkey, $val );
371 371
 				}
372 372
 			}
373 373
 
@@ -385,20 +385,20 @@  discard block
 block discarded – undo
385 385
 			foreach ( $subkey as $subkey2 ) {
386 386
 				foreach ( (array) $val as $ck => $cv ) {
387 387
 					if ( is_array( $cv ) ) {
388
-						$action[ $ck ] = $this->duplicate_array_walk( $action[ $ck ], $subkey2, $cv );
389
-					} elseif ( isset( $cv[ $subkey ] ) && is_numeric( $cv[ $subkey ] ) && isset( $frm_duplicate_ids[ $cv[ $subkey ] ] ) ) {
390
-						$action[ $ck ][ $subkey ] = $frm_duplicate_ids[ $cv[ $subkey ] ];
388
+						$action[$ck] = $this->duplicate_array_walk( $action[$ck], $subkey2, $cv );
389
+					} elseif ( isset( $cv[$subkey] ) && is_numeric( $cv[$subkey] ) && isset( $frm_duplicate_ids[$cv[$subkey]] ) ) {
390
+						$action[$ck][$subkey] = $frm_duplicate_ids[$cv[$subkey]];
391 391
 					}
392 392
 				}
393 393
 			}
394 394
 		} else {
395 395
 			foreach ( (array) $val as $ck => $cv ) {
396 396
 				if ( is_array( $cv ) ) {
397
-					$action[ $ck ] = $this->duplicate_array_walk( $action[ $ck ], $subkey, $cv );
398
-				} elseif ( $ck == $subkey && isset( $frm_duplicate_ids[ $cv ] ) ) {
399
-					$action[ $ck ] = $frm_duplicate_ids[ $cv ];
397
+					$action[$ck] = $this->duplicate_array_walk( $action[$ck], $subkey, $cv );
398
+				} elseif ( $ck == $subkey && isset( $frm_duplicate_ids[$cv] ) ) {
399
+					$action[$ck] = $frm_duplicate_ids[$cv];
400 400
 				} elseif ( $ck == $subkey ) {
401
-					$action[ $ck ] = $this->maybe_switch_field_ids( $action[ $ck ] );
401
+					$action[$ck] = $this->maybe_switch_field_ids( $action[$ck] );
402 402
 				}
403 403
 			}
404 404
 		}//end if
@@ -422,10 +422,10 @@  discard block
 block discarded – undo
422 422
 		}
423 423
 
424 424
 		// phpcs:ignore WordPress.Security.NonceVerification.Missing
425
-		if ( isset( $_POST[ $this->option_name ] ) && is_array( $_POST[ $this->option_name ] ) ) {
425
+		if ( isset( $_POST[$this->option_name] ) && is_array( $_POST[$this->option_name] ) ) {
426 426
 			// Sanitizing removes scripts and <email> type of values.
427 427
 			// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
428
-			$settings = wp_unslash( $_POST[ $this->option_name ] );
428
+			$settings = wp_unslash( $_POST[$this->option_name] );
429 429
 		} else {
430 430
 			return;
431 431
 		}
@@ -435,7 +435,7 @@  discard block
 block discarded – undo
435 435
 		foreach ( $settings as $number => $new_instance ) {
436 436
 			$this->_set( $number );
437 437
 
438
-			$old_instance = isset( $all_instances[ $number ] ) ? $all_instances[ $number ] : array();
438
+			$old_instance = isset( $all_instances[$number] ) ? $all_instances[$number] : array();
439 439
 
440 440
 			if ( ! isset( $new_instance['post_status'] ) ) {
441 441
 				$new_instance['post_status'] = 'draft';
@@ -474,7 +474,7 @@  discard block
 block discarded – undo
474 474
 			$instance['post_content'] = apply_filters( 'frm_before_save_' . $this->id_base . '_action', $instance['post_content'], $instance, $new_instance, $old_instance, $this );
475 475
 
476 476
 			if ( false !== $instance ) {
477
-				$all_instances[ $number ] = $instance;
477
+				$all_instances[$number] = $instance;
478 478
 			}
479 479
 
480 480
 			$action_ids[] = $this->save_settings( $instance );
@@ -560,12 +560,12 @@  discard block
 block discarded – undo
560 560
 			// some plugins/themes are formatting the post_excerpt
561 561
 			$action->post_excerpt = sanitize_title( $action->post_excerpt );
562 562
 
563
-			if ( ! isset( $action_controls[ $action->post_excerpt ] ) ) {
563
+			if ( ! isset( $action_controls[$action->post_excerpt] ) ) {
564 564
 				continue;
565 565
 			}
566 566
 
567
-			$action                  = $action_controls[ $action->post_excerpt ]->prepare_action( $action );
568
-			$settings[ $action->ID ] = $action;
567
+			$action                  = $action_controls[$action->post_excerpt]->prepare_action( $action );
568
+			$settings[$action->ID] = $action;
569 569
 
570 570
 			if ( count( $settings ) >= $limit ) {
571 571
 				break;
@@ -591,7 +591,7 @@  discard block
 block discarded – undo
591 591
 	 * @return int The filtered limit value.
592 592
 	 */
593 593
 	public static function get_action_limit( $form_id, $limit = 99 ) {
594
-		$type  = 'all';
594
+		$type = 'all';
595 595
 		return (int) apply_filters( 'frm_form_action_limit', (int) $limit, compact( 'type', 'form_id' ) );
596 596
 	}
597 597
 
@@ -614,7 +614,7 @@  discard block
 block discarded – undo
614 614
 			'limit'       => 99,
615 615
 			'post_status' => $default_status,
616 616
 		);
617
-		$args     = wp_parse_args( $args, $defaults );
617
+		$args = wp_parse_args( $args, $defaults );
618 618
 	}
619 619
 
620 620
 	/**
@@ -684,7 +684,7 @@  discard block
 block discarded – undo
684 684
 
685 685
 			$action = $this->prepare_action( $action );
686 686
 
687
-			$settings[ $action->ID ] = $action;
687
+			$settings[$action->ID] = $action;
688 688
 		}
689 689
 
690 690
 		if ( 1 === $limit ) {
@@ -727,10 +727,10 @@  discard block
 block discarded – undo
727 727
 
728 728
 		foreach ( $default_values as $k => $vals ) {
729 729
 			if ( is_array( $vals ) && ! empty( $vals ) ) {
730
-				if ( 'event' === $k && ! $this->action_options['force_event'] && ! empty( $action->post_content[ $k ] ) ) {
730
+				if ( 'event' === $k && ! $this->action_options['force_event'] && ! empty( $action->post_content[$k] ) ) {
731 731
 					continue;
732 732
 				}
733
-				$action->post_content[ $k ] = wp_parse_args( $action->post_content[ $k ], $vals );
733
+				$action->post_content[$k] = wp_parse_args( $action->post_content[$k], $vals );
734 734
 			}
735 735
 		}
736 736
 
@@ -818,9 +818,9 @@  discard block
 block discarded – undo
818 818
 
819 819
 		// fill with existing options
820 820
 		foreach ( $action->post_content as $name => $val ) {
821
-			if ( isset( $form->options[ $name ] ) ) {
822
-				$action->post_content[ $name ] = $form->options[ $name ];
823
-				unset( $form->options[ $name ] );
821
+			if ( isset( $form->options[$name] ) ) {
822
+				$action->post_content[$name] = $form->options[$name];
823
+				unset( $form->options[$name] );
824 824
 			}
825 825
 		}
826 826
 
@@ -906,8 +906,8 @@  discard block
 block discarded – undo
906 906
 	private static function get_value_from_entry( $entry, $field_id ) {
907 907
 		$observed_value = '';
908 908
 
909
-		if ( isset( $entry->metas[ $field_id ] ) ) {
910
-			$observed_value = $entry->metas[ $field_id ];
909
+		if ( isset( $entry->metas[$field_id] ) ) {
910
+			$observed_value = $entry->metas[$field_id];
911 911
 		} elseif ( $entry->post_id && FrmAppHelper::pro_is_installed() ) {
912 912
 			$field          = FrmField::getOne( $field_id );
913 913
 			$observed_value = FrmProEntryMetaHelper::get_post_or_meta_value(
@@ -981,7 +981,7 @@  discard block
 block discarded – undo
981 981
 		$form_fields = FrmField::get_all_for_form( $form_id, '', 'include' );
982 982
 		return array_filter(
983 983
 			$form_fields,
984
-			function ( $form_field ) {
984
+			function( $form_field ) {
985 985
 				return ! FrmField::is_no_save_field( $form_field->type );
986 986
 			}
987 987
 		);
Please login to merge, or discard this patch.
classes/views/solutions/_import.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 				$info['url'] = $xml;
12 12
 			}
13 13
 
14
-			$disabled = isset( $imported[ $info['form'] ] ) ? ' disabled' : '';
14
+			$disabled = isset( $imported[$info['form']] ) ? ' disabled' : '';
15 15
 			$url      = isset( $info['url'] ) ? $info['url'] : '';
16 16
 			$value    = $importing === 'form' ? $info['form'] : $info['key'];
17 17
 			if ( ! isset( $info['img'] ) ) {
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 				continue;
22 22
 			}
23 23
 
24
-			$hide_views = $importing === 'view' && ( ( $selected && $info['form'] !== $selected ) || isset( $imported[ $info['form'] ] ) );
24
+			$hide_views = $importing === 'view' && ( ( $selected && $info['form'] !== $selected ) || isset( $imported[$info['form']] ) );
25 25
 			?>
26 26
 			<div class="frm_radio radio-inline radio frm_image_option<?php echo esc_attr( $importing === 'view' ? ' show_sub_opt show_' . $info['form'] : '' ); ?>" style="<?php echo esc_attr( $hide_views ? 'display:none' : '' ); ?>">
27 27
 				<?php if ( $importing === 'form' ) { ?>
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 							}
55 55
 
56 56
 							if ( $importing === 'form' && $disabled ) {
57
-								FrmAppHelper::kses_echo( FrmFormsHelper::edit_form_link( $imported[ $info['form'] ] ), array( 'a' ) );
57
+								FrmAppHelper::kses_echo( FrmFormsHelper::edit_form_link( $imported[$info['form']] ), array( 'a' ) );
58 58
 							} else {
59 59
 								echo esc_html( $info['name'] );
60 60
 							}
Please login to merge, or discard this patch.
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.
square/helpers/FrmSquareLiteConnectHelper.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -160,7 +160,7 @@
 block discarded – undo
160 160
 	 * @return object|string
161 161
 	 */
162 162
 	private static function post_to_connect_server( $action, $additional_body = array() ) {
163
-		$body    = array(
163
+		$body = array(
164 164
 			'frm_square_api_action' => $action,
165 165
 			'frm_square_api_mode'   => FrmSquareLiteAppHelper::active_mode(),
166 166
 		);
Please login to merge, or discard this patch.
stripe/helpers/FrmTransLiteAppHelper.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 	 */
67 67
 	public static function show_status( $status ) {
68 68
 		$statuses = array_merge( self::get_payment_statuses(), self::get_subscription_statuses() );
69
-		return isset( $statuses[ $status ] ) ? $statuses[ $status ] : $status;
69
+		return isset( $statuses[$status] ) ? $statuses[$status] : $status;
70 70
 	}
71 71
 
72 72
 	/**
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 	 */
153 153
 	public static function get_action_setting( $option, $atts ) {
154 154
 		$settings = self::get_action_settings( $atts );
155
-		$value    = isset( $settings[ $option ] ) ? $settings[ $option ] : '';
155
+		$value    = isset( $settings[$option] ) ? $settings[$option] : '';
156 156
 		return $value;
157 157
 	}
158 158
 
@@ -255,8 +255,8 @@  discard block
 block discarded – undo
255 255
 	 */
256 256
 	public static function get_repeat_label_from_value( $value, $number ) {
257 257
 		$times = self::get_plural_repeat_times( $number );
258
-		if ( isset( $times[ $value ] ) ) {
259
-			$value = $times[ $value ];
258
+		if ( isset( $times[$value] ) ) {
259
+			$value = $times[$value];
260 260
 		}
261 261
 		return $value;
262 262
 	}
@@ -504,7 +504,7 @@  discard block
 block discarded – undo
504 504
 		$count = 0;
505 505
 		foreach ( $payments as $payment ) {
506 506
 			if ( $payment->status === 'complete' ) {
507
-				$count++;
507
+				$count ++;
508 508
 			}
509 509
 		}
510 510
 
@@ -526,8 +526,8 @@  discard block
 block discarded – undo
526 526
 		if ( is_array( $gateway ) ) {
527 527
 			$gateway = reset( $gateway );
528 528
 		}
529
-		if ( isset( $gateways[ $gateway ] ) ) {
530
-			$value = $gateways[ $gateway ][ $setting ];
529
+		if ( isset( $gateways[$gateway] ) ) {
530
+			$value = $gateways[$gateway][$setting];
531 531
 		}
532 532
 		return $value;
533 533
 	}
Please login to merge, or discard this patch.
classes/models/FrmValidate.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
 		}
50 50
 
51 51
 		$form = $this->get_form();
52
-		return ! empty( $form->options[ $key ] ) && 'off' !== $form->options[ $key ];
52
+		return ! empty( $form->options[$key] ) && 'off' !== $form->options[$key];
53 53
 	}
54 54
 
55 55
 	/**
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.