Completed
Pull Request — master (#2624)
by
unknown
42s
created
classes/models/FrmEntryShortcodeFormatter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -285,7 +285,7 @@
 block discarded – undo
285 285
 			'type'  => $field->type,
286 286
 		);
287 287
 
288
-		$this->array_content[ $field->id ] = apply_filters( 'frm_field_shortcodes_for_default_html_email', $array, $field );
288
+		$this->array_content[$field->id] = apply_filters( 'frm_field_shortcodes_for_default_html_email', $array, $field );
289 289
 	}
290 290
 
291 291
 	/**
Please login to merge, or discard this patch.
classes/models/FrmMigrate.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -326,7 +326,7 @@  discard block
 block discarded – undo
326 326
 				continue;
327 327
 			}
328 328
 
329
-			$this->maybe_convert_migrated_size( $widgets[ $k ]['size'] );
329
+			$this->maybe_convert_migrated_size( $widgets[$k]['size'] );
330 330
 		}
331 331
 		update_option( 'widget_frm_show_form', $widgets );
332 332
 	}
@@ -422,7 +422,7 @@  discard block
 block discarded – undo
422 422
 			if ( ! is_array( $widget ) || ! isset( $widget['size'] ) ) {
423 423
 				continue;
424 424
 			}
425
-			$this->convert_character_to_px( $widgets[ $k ]['size'] );
425
+			$this->convert_character_to_px( $widgets[$k]['size'] );
426 426
 		}
427 427
 		update_option( 'widget_frm_show_form', $widgets );
428 428
 	}
Please login to merge, or discard this patch.
classes/models/FrmInstallerSkin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
 	 */
22 22
 	public function set_upgrader( &$upgrader ) {
23 23
 		if ( is_object( $upgrader ) ) {
24
-			$this->upgrader =& $upgrader;
24
+			$this->upgrader = & $upgrader;
25 25
 		}
26 26
 	}
27 27
 
Please login to merge, or discard this patch.
classes/models/fields/FrmFieldUrl.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 			'sep'  => ', ',
40 40
 			'html' => false,
41 41
 		);
42
-		$atts     = wp_parse_args( $atts, $defaults );
42
+		$atts = wp_parse_args( $atts, $defaults );
43 43
 
44 44
 		if ( $atts['html'] ) {
45 45
 			$atts['sep'] = ' ';
@@ -61,9 +61,9 @@  discard block
 block discarded – undo
61 61
 
62 62
 		// validate the url format
63 63
 		if ( ! empty( $value ) && ! preg_match( '/^http(s)?:\/\/(?:localhost|(?:[\da-z\.-]+\.[\da-z\.-]+))/i', $value ) ) {
64
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' );
64
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' );
65 65
 		} elseif ( $this->field->required == '1' && empty( $value ) ) {
66
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $this->field, 'blank' );
66
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $this->field, 'blank' );
67 67
 		}
68 68
 
69 69
 		return $errors;
Please login to merge, or discard this patch.
classes/models/FrmFieldValue.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -59,8 +59,8 @@
 block discarded – undo
59 59
 	protected function init_saved_value( $entry ) {
60 60
 		if ( $this->field->type === 'html' ) {
61 61
 			$this->saved_value = $this->field->description;
62
-		} elseif ( isset( $entry->metas[ $this->field->id ] ) ) {
63
-			$this->saved_value = $entry->metas[ $this->field->id ];
62
+		} elseif ( isset( $entry->metas[$this->field->id] ) ) {
63
+			$this->saved_value = $entry->metas[$this->field->id];
64 64
 		} else {
65 65
 			$this->saved_value = '';
66 66
 		}
Please login to merge, or discard this patch.
classes/controllers/FrmSMTPController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -235,7 +235,7 @@
 block discarded – undo
235 235
 		if ( is_array( $upsell ) ) {
236 236
 			foreach ( $upsell as $k => $plugin ) {
237 237
 				if ( strpos( $plugin['slug'], 'wpforms' ) !== false ) {
238
-					unset( $upsell[ $k ] );
238
+					unset( $upsell[$k] );
239 239
 				}
240 240
 			}
241 241
 		}
Please login to merge, or discard this patch.
classes/models/FrmSolution.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,8 @@
 block discarded – undo
42 42
 		}
43 43
 
44 44
 		// Only do this for single site installs.
45
-		if ( isset( $_GET['activate-multi'] ) || is_network_admin() ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
45
+		if ( isset( $_GET['activate-multi'] ) || is_network_admin() ) {
46
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
46 47
 			return;
47 48
 		}
48 49
 
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
 	 */
207 207
 	public function add_settings( $sections ) {
208 208
 		wp_enqueue_style( 'formidable-pro-fields' );
209
-		$sections[ $this->plugin_slug ] = array(
209
+		$sections[$this->plugin_slug] = array(
210 210
 			'class'    => $this,
211 211
 			'function' => 'settings_page',
212 212
 			'name'     => $this->plugin_name(),
@@ -375,9 +375,9 @@  discard block
 block discarded – undo
375 375
 			// Set the current step.
376 376
 			if ( ! isset( $step['current'] ) ) {
377 377
 				if ( $step['complete'] ) {
378
-					$steps[ $k ]['current'] = false;
378
+					$steps[$k]['current'] = false;
379 379
 				} else {
380
-					$steps[ $k ]['current'] = ! $has_current;
380
+					$steps[$k]['current'] = ! $has_current;
381 381
 					$has_current            = true;
382 382
 				}
383 383
 			} elseif ( $step['current'] ) {
@@ -387,10 +387,10 @@  discard block
 block discarded – undo
387 387
 			// Set disabled buttons.
388 388
 			$class  = $step['button_class'] ?? '';
389 389
 			$class .= ' button-primary frm-button-primary';
390
-			if ( ! $steps[ $k ]['current'] ) {
390
+			if ( ! $steps[$k]['current'] ) {
391 391
 				$class .= ' frm_grey disabled';
392 392
 			}
393
-			$steps[ $k ]['button_class'] = $class;
393
+			$steps[$k]['button_class'] = $class;
394 394
 		}//end foreach
395 395
 
396 396
 		return $steps;
@@ -555,7 +555,7 @@  discard block
 block discarded – undo
555 555
 		$addons = $api->get_api_info();
556 556
 
557 557
 		$id       = $this->download_id();
558
-		$has_file = isset( $addons[ $id ] ) && isset( $addons[ $id ]['beta'] );
558
+		$has_file = isset( $addons[$id] ) && isset( $addons[$id]['beta'] );
559 559
 
560 560
 		if ( ! $step['current'] ) {
561 561
 			?>
@@ -570,10 +570,10 @@  discard block
 block discarded – undo
570 570
 
571 571
 		if ( ! $has_file ) {
572 572
 			echo '<p class="frm_error_style">' . esc_html__( 'We didn\'t find anything to import. Please contact our team.', 'formidable' ) . '</p>';
573
-		} elseif ( ! isset( $addons[ $id ]['beta']['package'] ) ) {
573
+		} elseif ( ! isset( $addons[$id]['beta']['package'] ) ) {
574 574
 			echo '<p class="frm_error_style">' . esc_html__( 'Looks like you may not have a current subscription for this solution. Please check your account.', 'formidable' ) . '</p>';
575 575
 		} else {
576
-			$xml = $addons[ $id ]['beta']['package'];
576
+			$xml = $addons[$id]['beta']['package'];
577 577
 			if ( is_array( $xml ) ) {
578 578
 				$xml = reset( $xml );
579 579
 			}
@@ -652,7 +652,7 @@  discard block
 block discarded – undo
652 652
 		foreach ( $options as $info ) {
653 653
 			// Count the number of options displayed for css.
654 654
 			if ( $count > 1 && ! isset( $info['img'] ) ) {
655
-				--$count;
655
+				-- $count;
656 656
 			}
657 657
 		}
658 658
 
@@ -745,7 +745,7 @@  discard block
 block discarded – undo
745 745
 		foreach ( $forms as $form ) {
746 746
 			$was_imported = isset( $form['form'] ) ? FrmForm::get_id_by_key( $form['form'] ) : false;
747 747
 			if ( $was_imported ) {
748
-				$imported[ $form['form'] ] = $was_imported;
748
+				$imported[$form['form']] = $was_imported;
749 749
 			}
750 750
 		}
751 751
 
Please login to merge, or discard this patch.
classes/views/frm-forms/landing-page-preview-option.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@
 block discarded – undo
6 6
 $data_keys = array_keys( $data );
7 7
 $params    = array();
8 8
 foreach ( $data_keys as $key ) {
9
-	$params[ 'data-' . $key ] = $data[ $key ];
9
+	$params['data-' . $key] = $data[$key];
10 10
 }
11 11
 $params['class'] = 'frm_show_upgrade frm_noallow';
12 12
 $params['href']  = '#';
Please login to merge, or discard this patch.
classes/models/FrmStyle.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,8 @@
 block discarded – undo
67 67
 			$new_instance = (array) $new_instance;
68 68
 			$this->id     = $new_instance['ID'];
69 69
 
70
-			if ( $id != $this->id || ! $_POST || ! isset( $_POST['frm_style_setting'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
70
+			if ( $id != $this->id || ! $_POST || ! isset( $_POST['frm_style_setting'] ) ) {
71
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
71 72
 				// Don't continue if not saving this style.
72 73
 				continue;
73 74
 			}
Please login to merge, or discard this patch.
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -102,21 +102,21 @@  discard block
 block discarded – undo
102 102
 			$default_settings = $this->get_defaults();
103 103
 
104 104
 			foreach ( $default_settings as $setting => $default ) {
105
-				if ( ! isset( $new_instance['post_content'][ $setting ] ) ) {
106
-					$new_instance['post_content'][ $setting ] = $default;
105
+				if ( ! isset( $new_instance['post_content'][$setting] ) ) {
106
+					$new_instance['post_content'][$setting] = $default;
107 107
 				}
108 108
 
109 109
 				if ( $this->is_color( $setting ) ) {
110
-					$color_val = $new_instance['post_content'][ $setting ];
110
+					$color_val = $new_instance['post_content'][$setting];
111 111
 					if ( $color_val !== '' && false !== strpos( $color_val, 'rgb' ) ) {
112 112
 						// Maybe sanitize if invalid rgba value is entered.
113 113
 						$this->maybe_sanitize_rgba_value( $color_val );
114 114
 					}
115
-					$new_instance['post_content'][ $setting ] = str_replace( '#', '', $color_val );
116
-				} elseif ( in_array( $setting, array( 'submit_style', 'important_style', 'auto_width' ), true ) && ! isset( $new_instance['post_content'][ $setting ] ) ) {
117
-					$new_instance['post_content'][ $setting ] = 0;
115
+					$new_instance['post_content'][$setting] = str_replace( '#', '', $color_val );
116
+				} elseif ( in_array( $setting, array( 'submit_style', 'important_style', 'auto_width' ), true ) && ! isset( $new_instance['post_content'][$setting] ) ) {
117
+					$new_instance['post_content'][$setting] = 0;
118 118
 				} elseif ( $setting === 'font' ) {
119
-					$new_instance['post_content'][ $setting ] = $this->force_balanced_quotation( $new_instance['post_content'][ $setting ] );
119
+					$new_instance['post_content'][$setting] = $this->force_balanced_quotation( $new_instance['post_content'][$setting] );
120 120
 				}
121 121
 			}
122 122
 
@@ -236,14 +236,14 @@  discard block
 block discarded – undo
236 236
 		$valid_keys         = array_keys( $defaults );
237 237
 		$sanitized_settings = array();
238 238
 		foreach ( $valid_keys as $key ) {
239
-			if ( isset( $settings[ $key ] ) ) {
240
-				$sanitized_settings[ $key ] = sanitize_textarea_field( $settings[ $key ] );
239
+			if ( isset( $settings[$key] ) ) {
240
+				$sanitized_settings[$key] = sanitize_textarea_field( $settings[$key] );
241 241
 			} else {
242
-				$sanitized_settings[ $key ] = $defaults[ $key ];
242
+				$sanitized_settings[$key] = $defaults[$key];
243 243
 			}
244 244
 			
245 245
 			if ( 'custom_css' !== $key ) {
246
-				$sanitized_settings[ $key ] = $this->strip_invalid_characters( $sanitized_settings[ $key ] );
246
+				$sanitized_settings[$key] = $this->strip_invalid_characters( $sanitized_settings[$key] );
247 247
 			}
248 248
 		}
249 249
 		return $sanitized_settings;
@@ -493,13 +493,13 @@  discard block
 block discarded – undo
493 493
 			$style->post_content = $this->override_defaults( $style->post_content );
494 494
 			$style->post_content = wp_parse_args( $style->post_content, $default_values );
495 495
 
496
-			$styles[ $style->ID ] = $style;
496
+			$styles[$style->ID] = $style;
497 497
 		}
498 498
 
499 499
 		if ( ! $default_style ) {
500 500
 			$default_style = reset( $styles );
501 501
 
502
-			$styles[ $default_style->ID ]->menu_order = 1;
502
+			$styles[$default_style->ID]->menu_order = 1;
503 503
 		}
504 504
 
505 505
 		return $styles;
@@ -743,7 +743,7 @@  discard block
 block discarded – undo
743 743
 				continue;
744 744
 			}
745 745
 
746
-			if ( $value && $char === $value[ strlen( $value ) - 1 ] ) {
746
+			if ( $value && $char === $value[strlen( $value ) - 1] ) {
747 747
 				$value = $char . $value;
748 748
 			} else {
749 749
 				$value .= $char;
Please login to merge, or discard this patch.