Completed
Pull Request — master (#2266)
by
unknown
47s
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/views/frm-form-actions/_action_inside.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
 	$event_labels = FrmFormAction::trigger_labels();
37 37
 	foreach ( $action_control->action_options['event'] as $event ) {
38 38
 		?>
39
-		<option value="<?php echo esc_attr( $event ); ?>" <?php echo in_array( $event, (array) $form_action->post_content['event'] ) ? ' selected="selected"' : ''; ?> ><?php echo esc_html( isset( $event_labels[ $event ] ) ? $event_labels[ $event ] : $event ); ?></option>
39
+		<option value="<?php echo esc_attr( $event ); ?>" <?php echo in_array( $event, (array) $form_action->post_content['event'] ) ? ' selected="selected"' : ''; ?> ><?php echo esc_html( isset( $event_labels[$event] ) ? $event_labels[$event] : $event ); ?></option>
40 40
 <?php } ?>
41 41
 		</select>
42 42
 	</p>
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/fields/FrmFieldName.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -46,19 +46,19 @@  discard block
 block discarded – undo
46 46
 		$result = array();
47 47
 
48 48
 		foreach ( $names as $name ) {
49
-			if ( empty( $this->sub_fields[ $name ] ) ) {
49
+			if ( empty( $this->sub_fields[$name] ) ) {
50 50
 				continue;
51 51
 			}
52 52
 
53
-			if ( ! isset( $this->sub_fields[ $name ]['wrapper_classes'] ) ) {
54
-				$this->sub_fields[ $name ]['wrapper_classes'] = $col_class;
55
-			} elseif ( is_array( $this->sub_fields[ $name ]['wrapper_classes'] ) ) {
56
-				$this->sub_fields[ $name ]['wrapper_classes'] = implode( ' ', $this->sub_fields[ $name ]['wrapper_classes'] ) . ' ' . $col_class;
53
+			if ( ! isset( $this->sub_fields[$name]['wrapper_classes'] ) ) {
54
+				$this->sub_fields[$name]['wrapper_classes'] = $col_class;
55
+			} elseif ( is_array( $this->sub_fields[$name]['wrapper_classes'] ) ) {
56
+				$this->sub_fields[$name]['wrapper_classes'] = implode( ' ', $this->sub_fields[$name]['wrapper_classes'] ) . ' ' . $col_class;
57 57
 			} else {
58
-				$this->sub_fields[ $name ]['wrapper_classes'] .= ' ' . $col_class;
58
+				$this->sub_fields[$name]['wrapper_classes'] .= ' ' . $col_class;
59 59
 			}
60 60
 
61
-			$result[ $name ] = $this->sub_fields[ $name ];
61
+			$result[$name] = $this->sub_fields[$name];
62 62
 		}
63 63
 
64 64
 		return $result;
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 
90 90
 		// Default desc.
91 91
 		foreach ( $this->sub_fields as $name => $sub_field ) {
92
-			$extra_options[ $name . '_desc' ] = $sub_field['label'];
92
+			$extra_options[$name . '_desc'] = $sub_field['label'];
93 93
 		}
94 94
 
95 95
 		return $extra_options;
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 		$name_layout = $this->get_name_layout();
126 126
 
127 127
 		if ( ! empty( $atts['show'] ) ) {
128
-			return isset( $value[ $atts['show'] ] ) ? $value[ $atts['show'] ] : '';
128
+			return isset( $value[$atts['show']] ) ? $value[$atts['show']] : '';
129 129
 		}
130 130
 
131 131
 		$value = wp_parse_args(
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
 			$args['sub_fields'] = $this->sub_fields;
199 199
 
200 200
 			foreach ( $hidden_fields as $name => $hidden_field ) {
201
-				$args['sub_fields'][ $name ]['wrapper_classes'] .= ' frm_hidden';
201
+				$args['sub_fields'][$name]['wrapper_classes'] .= ' frm_hidden';
202 202
 			}
203 203
 		}
204 204
 	}
Please login to merge, or discard this patch.
classes/controllers/FrmEntriesController.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -491,7 +491,8 @@
 block discarded – undo
491 491
 
492 492
 	public static function process_entry( $errors = '', $ajax = false ) {
493 493
 		$form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
494
-		if ( FrmAppHelper::is_admin() || empty( $_POST ) || empty( $form_id ) || ! isset( $_POST['item_key'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
494
+		if ( FrmAppHelper::is_admin() || empty( $_POST ) || empty( $form_id ) || ! isset( $_POST['item_key'] ) ) {
495
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
495 496
 			return;
496 497
 		}
497 498
 
Please login to merge, or discard this patch.
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -77,20 +77,20 @@  discard block
 block discarded – undo
77 77
 		global $frm_vars;
78 78
 		$form_id = FrmForm::get_current_form_id();
79 79
 
80
-		$columns[ $form_id . '_id' ]       = 'ID';
81
-		$columns[ $form_id . '_item_key' ] = esc_html__( 'Entry Key', 'formidable' );
80
+		$columns[$form_id . '_id']       = 'ID';
81
+		$columns[$form_id . '_item_key'] = esc_html__( 'Entry Key', 'formidable' );
82 82
 
83 83
 		if ( $form_id ) {
84 84
 			self::get_columns_for_form( $form_id, $columns );
85 85
 		} else {
86
-			$columns[ $form_id . '_form_id' ] = esc_html__( 'Form', 'formidable' );
87
-			$columns[ $form_id . '_name' ]    = esc_html__( 'Entry Name', 'formidable' );
88
-			$columns[ $form_id . '_user_id' ] = esc_html__( 'Created By', 'formidable' );
86
+			$columns[$form_id . '_form_id'] = esc_html__( 'Form', 'formidable' );
87
+			$columns[$form_id . '_name']    = esc_html__( 'Entry Name', 'formidable' );
88
+			$columns[$form_id . '_user_id'] = esc_html__( 'Created By', 'formidable' );
89 89
 		}
90 90
 
91
-		$columns[ $form_id . '_is_draft' ]   = esc_html__( 'Entry Status', 'formidable' );
92
-		$columns[ $form_id . '_created_at' ] = __( 'Entry creation date', 'formidable' );
93
-		$columns[ $form_id . '_updated_at' ] = __( 'Entry update date', 'formidable' );
91
+		$columns[$form_id . '_is_draft']   = esc_html__( 'Entry Status', 'formidable' );
92
+		$columns[$form_id . '_created_at'] = __( 'Entry creation date', 'formidable' );
93
+		$columns[$form_id . '_updated_at'] = __( 'Entry update date', 'formidable' );
94 94
 		self::maybe_add_ip_col( $form_id, $columns );
95 95
 
96 96
 		$frm_vars['cols'] = $columns;
@@ -148,10 +148,10 @@  discard block
 block discarded – undo
148 148
 
149 149
 		foreach ( $sub_form_cols as $k => $sub_form_col ) {
150 150
 			if ( FrmField::is_no_save_field( $sub_form_col->type ) ) {
151
-				unset( $sub_form_cols[ $k ] );
151
+				unset( $sub_form_cols[$k] );
152 152
 				continue;
153 153
 			}
154
-			$columns[ $form_id . '_' . $sub_form_col->field_key . '-_-' . $field->id ] = FrmAppHelper::truncate( $sub_form_col->name, 35 );
154
+			$columns[$form_id . '_' . $sub_form_col->field_key . '-_-' . $field->id] = FrmAppHelper::truncate( $sub_form_col->name, 35 );
155 155
 			unset( $sub_form_col );
156 156
 		}
157 157
 	}
@@ -168,15 +168,15 @@  discard block
 block discarded – undo
168 168
 		$has_separate_value = ! FrmField::is_option_empty( $field, 'separate_value' );
169 169
 		$is_post_status     = FrmField::is_option_true( $field, 'post_field' ) && $field->field_options['post_field'] === 'post_status';
170 170
 		if ( $has_separate_value && ! $is_post_status ) {
171
-			$columns[ $form_id . '_frmsep_' . $col_id ] = FrmAppHelper::truncate( $field->name, 35 );
171
+			$columns[$form_id . '_frmsep_' . $col_id] = FrmAppHelper::truncate( $field->name, 35 );
172 172
 		}
173 173
 
174
-		$columns[ $form_id . '_' . $col_id ] = FrmAppHelper::truncate( $field->name, 35 );
174
+		$columns[$form_id . '_' . $col_id] = FrmAppHelper::truncate( $field->name, 35 );
175 175
 	}
176 176
 
177 177
 	private static function maybe_add_ip_col( $form_id, &$columns ) {
178 178
 		if ( FrmAppHelper::ips_saved() ) {
179
-			$columns[ $form_id . '_ip' ] = 'IP';
179
+			$columns[$form_id . '_ip'] = 'IP';
180 180
 		}
181 181
 	}
182 182
 
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
 		foreach ( $meta_value as $mk => $mv ) {
216 216
 			// Remove blank values.
217 217
 			if ( empty( $mv ) ) {
218
-				unset( $meta_value[ $mk ] );
218
+				unset( $meta_value[$mk] );
219 219
 			}
220 220
 		}
221 221
 
@@ -290,14 +290,14 @@  discard block
 block discarded – undo
290 290
 		);
291 291
 
292 292
 		if ( ! $form_id ) {
293
-			$columns[ $form_id . '_user_id' ] = 'user_id';
294
-			$columns[ $form_id . '_name' ]    = 'name';
295
-			$columns[ $form_id . '_form_id' ] = 'form_id';
293
+			$columns[$form_id . '_user_id'] = 'user_id';
294
+			$columns[$form_id . '_name']    = 'name';
295
+			$columns[$form_id . '_form_id'] = 'form_id';
296 296
 		}
297 297
 
298 298
 		foreach ( $fields as $field ) {
299 299
 			if ( self::field_supports_sorting( $field ) ) {
300
-				$columns[ $form_id . '_' . $field->field_key ] = 'meta_' . $field->id;
300
+				$columns[$form_id . '_' . $field->field_key] = 'meta_' . $field->id;
301 301
 			}
302 302
 		}
303 303
 
@@ -384,7 +384,7 @@  discard block
 block discarded – undo
384 384
 			$atts['form_id'] . '_item_key' => '',
385 385
 			$atts['form_id'] . '_id'       => '',
386 386
 		);
387
-		$cols         = $remove_first + array_reverse( $frm_vars['cols'], true );
387
+		$cols = $remove_first + array_reverse( $frm_vars['cols'], true );
388 388
 
389 389
 		$i = $atts['i'];
390 390
 
@@ -395,7 +395,7 @@  discard block
 block discarded – undo
395 395
 
396 396
 			if ( empty( $result ) || ! in_array( $col_key, $result, true ) ) {
397 397
 				$result[] = $col_key;
398
-				--$i;
398
+				-- $i;
399 399
 			}
400 400
 
401 401
 			unset( $col_key, $col );
@@ -545,9 +545,9 @@  discard block
 block discarded – undo
545 545
 		if ( ! isset( $frm_vars['form_params'] ) ) {
546 546
 			$frm_vars['form_params'] = array();
547 547
 		}
548
-		$frm_vars['form_params'][ $form->id ] = $params;
548
+		$frm_vars['form_params'][$form->id] = $params;
549 549
 
550
-		if ( isset( $frm_vars['created_entries'][ $form_id ] ) ) {
550
+		if ( isset( $frm_vars['created_entries'][$form_id] ) ) {
551 551
 			return;
552 552
 		}
553 553
 
@@ -563,16 +563,16 @@  discard block
 block discarded – undo
563 563
 		 */
564 564
 		$errors = apply_filters( 'frm_entries_before_create', $errors, $form );
565 565
 
566
-		$frm_vars['created_entries'][ $form_id ] = array( 'errors' => $errors );
566
+		$frm_vars['created_entries'][$form_id] = array( 'errors' => $errors );
567 567
 
568 568
 		if ( empty( $errors ) ) {
569 569
 			$_POST['frm_skip_cookie'] = 1;
570 570
 			$do_success               = false;
571 571
 			if ( $params['action'] === 'create' ) {
572
-				if ( apply_filters( 'frm_continue_to_create', true, $form_id ) && ! isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ) {
573
-					$frm_vars['created_entries'][ $form_id ]['entry_id'] = FrmEntry::create( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
572
+				if ( apply_filters( 'frm_continue_to_create', true, $form_id ) && ! isset( $frm_vars['created_entries'][$form_id]['entry_id'] ) ) {
573
+					$frm_vars['created_entries'][$form_id]['entry_id'] = FrmEntry::create( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
574 574
 
575
-					$params['id'] = $frm_vars['created_entries'][ $form_id ]['entry_id'];
575
+					$params['id'] = $frm_vars['created_entries'][$form_id]['entry_id'];
576 576
 					$do_success   = true;
577 577
 				}
578 578
 			}
Please login to merge, or discard this patch.