Completed
Pull Request — master (#1038)
by Stephanie
01:05
created
classes/controllers/FrmStylesController.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -119,7 +119,8 @@
 block discarded – undo
119 119
 	 * @return void
120 120
 	 */
121 121
 	private static function maybe_hook_into_global_settings_save() {
122
-		if ( empty( $_POST ) || ! isset( $_POST['style'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
122
+		if ( empty( $_POST ) || ! isset( $_POST['style'] ) ) {
123
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
123 124
 			// Avoid changing any style data if the style array is not sent in the request.
124 125
 			return;
125 126
 		}
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -651,7 +651,7 @@  discard block
 block discarded – undo
651 651
 		}
652 652
 
653 653
 		parse_str( $query, $parsed_query );
654
-		$form_id      = ! empty( $parsed_query['form'] ) ? absint( $parsed_query['form'] ) : 0;
654
+		$form_id = ! empty( $parsed_query['form'] ) ? absint( $parsed_query['form'] ) : 0;
655 655
 
656 656
 		$style     = new stdClass();
657 657
 		$style->ID = end( $ids );
@@ -689,8 +689,8 @@  discard block
 block discarded – undo
689 689
 
690 690
 		$forms = FrmForm::get_published_forms();
691 691
 		foreach ( $forms as $form ) {
692
-			$new_style      = ( isset( $_POST['style'] ) && isset( $_POST['style'][ $form->id ] ) ) ? sanitize_text_field( wp_unslash( $_POST['style'][ $form->id ] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Missing
693
-			$previous_style = ( isset( $_POST['prev_style'] ) && isset( $_POST['prev_style'][ $form->id ] ) ) ? sanitize_text_field( wp_unslash( $_POST['prev_style'][ $form->id ] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Missing
692
+			$new_style      = ( isset( $_POST['style'] ) && isset( $_POST['style'][$form->id] ) ) ? sanitize_text_field( wp_unslash( $_POST['style'][$form->id] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Missing
693
+			$previous_style = ( isset( $_POST['prev_style'] ) && isset( $_POST['prev_style'][$form->id] ) ) ? sanitize_text_field( wp_unslash( $_POST['prev_style'][$form->id] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Missing
694 694
 			if ( $new_style == $previous_style ) {
695 695
 				continue;
696 696
 			}
@@ -1064,8 +1064,8 @@  discard block
 block discarded – undo
1064 1064
 	 */
1065 1065
 	public static function get_style_val( $val, $form = 'default' ) {
1066 1066
 		$style = self::get_form_style( $form );
1067
-		if ( $style && isset( $style->post_content[ $val ] ) ) {
1068
-			return $style->post_content[ $val ];
1067
+		if ( $style && isset( $style->post_content[$val] ) ) {
1068
+			return $style->post_content[$val];
1069 1069
 		}
1070 1070
 	}
1071 1071
 
@@ -1084,7 +1084,7 @@  discard block
 block discarded – undo
1084 1084
 			} elseif ( 'alt_bg_color' == $name ) {
1085 1085
 				$setting = 'bg_color_active';
1086 1086
 			}
1087
-			$default_styles[ $name ] = $style->post_content[ $setting ];
1087
+			$default_styles[$name] = $style->post_content[$setting];
1088 1088
 			unset( $name, $val );
1089 1089
 		}
1090 1090
 
Please login to merge, or discard this patch.
classes/models/FrmStyle.php 2 patches
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -84,21 +84,21 @@  discard block
 block discarded – undo
84 84
 			$default_settings = $this->get_defaults();
85 85
 
86 86
 			foreach ( $default_settings as $setting => $default ) {
87
-				if ( ! isset( $new_instance['post_content'][ $setting ] ) ) {
88
-					$new_instance['post_content'][ $setting ] = $default;
87
+				if ( ! isset( $new_instance['post_content'][$setting] ) ) {
88
+					$new_instance['post_content'][$setting] = $default;
89 89
 				}
90 90
 
91 91
 				if ( $this->is_color( $setting ) ) {
92
-					$color_val = $new_instance['post_content'][ $setting ];
92
+					$color_val = $new_instance['post_content'][$setting];
93 93
 					if ( $color_val !== '' && 0 === strpos( $color_val, 'rgb' ) ) {
94 94
 						// maybe sanitize if invalid rgba value is entered
95 95
 						$this->maybe_sanitize_rgba_value( $color_val );
96 96
 					}
97
-					$new_instance['post_content'][ $setting ] = str_replace( '#', '', $color_val );
98
-				} elseif ( in_array( $setting, array( 'submit_style', 'important_style', 'auto_width' ), true ) && ! isset( $new_instance['post_content'][ $setting ] ) ) {
99
-					$new_instance['post_content'][ $setting ] = 0;
97
+					$new_instance['post_content'][$setting] = str_replace( '#', '', $color_val );
98
+				} elseif ( in_array( $setting, array( 'submit_style', 'important_style', 'auto_width' ), true ) && ! isset( $new_instance['post_content'][$setting] ) ) {
99
+					$new_instance['post_content'][$setting] = 0;
100 100
 				} elseif ( $setting === 'font' ) {
101
-					$new_instance['post_content'][ $setting ] = $this->force_balanced_quotation( $new_instance['post_content'][ $setting ] );
101
+					$new_instance['post_content'][$setting] = $this->force_balanced_quotation( $new_instance['post_content'][$setting] );
102 102
 				}
103 103
 			}
104 104
 
@@ -211,10 +211,10 @@  discard block
 block discarded – undo
211 211
 		$valid_keys         = array_keys( $defaults );
212 212
 		$sanitized_settings = array();
213 213
 		foreach ( $valid_keys as $key ) {
214
-			if ( isset( $settings[ $key ] ) ) {
215
-				$sanitized_settings[ $key ] = sanitize_textarea_field( $settings[ $key ] );
214
+			if ( isset( $settings[$key] ) ) {
215
+				$sanitized_settings[$key] = sanitize_textarea_field( $settings[$key] );
216 216
 			} else {
217
-				$sanitized_settings[ $key ] = $defaults[ $key ];
217
+				$sanitized_settings[$key] = $defaults[$key];
218 218
 			}
219 219
 		}
220 220
 		return $sanitized_settings;
@@ -381,13 +381,13 @@  discard block
 block discarded – undo
381 381
 			$style->post_content = $this->override_defaults( $style->post_content );
382 382
 			$style->post_content = wp_parse_args( $style->post_content, $default_values );
383 383
 
384
-			$styles[ $style->ID ] = $style;
384
+			$styles[$style->ID] = $style;
385 385
 		}
386 386
 
387 387
 		if ( ! $default_style ) {
388 388
 			$default_style = reset( $styles );
389 389
 
390
-			$styles[ $default_style->ID ]->menu_order = 1;
390
+			$styles[$default_style->ID]->menu_order = 1;
391 391
 		}
392 392
 
393 393
 		return $styles;
Please login to merge, or discard this patch.
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.
classes/helpers/FrmStylesHelper.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -285,7 +285,8 @@
 block discarded – undo
285 285
 	public static function get_settings_for_output( $style ) {
286 286
 		if ( self::previewing_style() ) {
287 287
 			$frm_style = new FrmStyle();
288
-			if ( isset( $_POST['frm_style_setting'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
288
+			if ( isset( $_POST['frm_style_setting'] ) ) {
289
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
289 290
 
290 291
 				// Sanitizing is done later.
291 292
 				$posted = wp_unslash( $_POST['frm_style_setting'] ); //phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
 				'-' => 'down',
136 136
 				'+' => 'up',
137 137
 			);
138
-			$class = 'frm_arrow' . $arrow[ $icon ];
138
+			$class = 'frm_arrow' . $arrow[$icon];
139 139
 		} else {
140 140
 			//frm_minus1_icon
141 141
 			$key   = str_replace( 'p', '', $key );
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 				'-' => 'minus',
144 144
 				'+' => 'plus',
145 145
 			);
146
-			$class = 'frm_' . $plus[ $icon ];
146
+			$class = 'frm_' . $plus[$icon];
147 147
 		}
148 148
 
149 149
 		if ( $key ) {
@@ -169,8 +169,8 @@  discard block
 block discarded – undo
169 169
 		?>
170 170
 		<div class="btn-group" id="frm_<?php echo esc_attr( $name ); ?>_select">
171 171
 			<button class="multiselect dropdown-toggle btn btn-default" data-toggle="dropdown" type="button">
172
-				<?php FrmAppHelper::icon_by_class( 'frmfont ' . self::icon_key_to_class( $style->post_content[ $name ], '+', $type ) ); ?>
173
-				<?php FrmAppHelper::icon_by_class( 'frmfont ' . self::icon_key_to_class( $style->post_content[ $name ], '-', $type ) ); ?>
172
+				<?php FrmAppHelper::icon_by_class( 'frmfont ' . self::icon_key_to_class( $style->post_content[$name], '+', $type ) ); ?>
173
+				<?php FrmAppHelper::icon_by_class( 'frmfont ' . self::icon_key_to_class( $style->post_content[$name], '-', $type ) ); ?>
174 174
 				<b class="caret"></b>
175 175
 			</button>
176 176
 			<ul class="multiselect-container frm-dropdown-menu">
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 					<li <?php echo ( $style->post_content['collapse_icon'] == $key ) ? 'class="active"' : ''; ?>>
179 179
 						<a href="javascript:void(0);">
180 180
 							<label>
181
-								<input type="radio" value="<?php echo esc_attr( $key ); ?>" name="<?php echo esc_attr( $frm_style->get_field_name( $name ) ); ?>" <?php checked( $style->post_content[ $name ], $key ); ?> />
181
+								<input type="radio" value="<?php echo esc_attr( $key ); ?>" name="<?php echo esc_attr( $frm_style->get_field_name( $name ) ); ?>" <?php checked( $style->post_content[$name], $key ); ?> />
182 182
 								<span>
183 183
 									<?php
184 184
 									FrmAppHelper::icon_by_class( 'frmfont ' . self::icon_key_to_class( $key, '+', $type ) );
@@ -271,15 +271,15 @@  discard block
 block discarded – undo
271 271
 		$vars   = array_diff( $vars, $remove );
272 272
 
273 273
 		foreach ( $vars as $var ) {
274
-			if ( ! isset( $settings[ $var ] ) ) {
274
+			if ( ! isset( $settings[$var] ) ) {
275 275
 				continue;
276 276
 			}
277
-			if ( ! isset( $defaults[ $var ] ) ) {
278
-				$defaults[ $var ] = '';
277
+			if ( ! isset( $defaults[$var] ) ) {
278
+				$defaults[$var] = '';
279 279
 			}
280
-			$show = empty( $defaults ) || ( $settings[ $var ] !== '' && $settings[ $var ] !== $defaults[ $var ] );
280
+			$show = empty( $defaults ) || ( $settings[$var] !== '' && $settings[$var] !== $defaults[$var] );
281 281
 			if ( $show ) {
282
-				echo '--' . esc_html( str_replace( '_', '-', $var ) ) . ':' . ( $var === 'font' ? FrmAppHelper::kses( $settings[ $var ] ) : esc_html( $settings[ $var ] ) ) . ';'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
282
+				echo '--' . esc_html( str_replace( '_', '-', $var ) ) . ':' . ( $var === 'font' ? FrmAppHelper::kses( $settings[$var] ) : esc_html( $settings[$var] ) ) . ';'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
283 283
 			}
284 284
 		}
285 285
 	}
@@ -328,8 +328,8 @@  discard block
 block discarded – undo
328 328
 
329 329
 		$checkbox_opts = array( 'important_style', 'auto_width', 'submit_style', 'collapse_icon', 'center_form' );
330 330
 		foreach ( $checkbox_opts as $opt ) {
331
-			if ( ! isset( $settings[ $opt ] ) ) {
332
-				$settings[ $opt ] = 0;
331
+			if ( ! isset( $settings[$opt] ) ) {
332
+				$settings[$opt] = 0;
333 333
 			}
334 334
 		}
335 335
 
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
357 357
 				$css = '';
358 358
 			}
359 359
 			foreach ( $opts as $opt ) {
360
-				self::get_color_output( $css, $settings[ $opt ] );
360
+				self::get_color_output( $css, $settings[$opt] );
361 361
 			}
362 362
 		}
363 363
 	}
Please login to merge, or discard this patch.
classes/helpers/FrmStylesPreviewHelper.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -168,7 +168,7 @@
 block discarded – undo
168 168
 			return;
169 169
 		}
170 170
 
171
-		unset( $dependencies[ $index ] );
171
+		unset( $dependencies[$index] );
172 172
 		$dependencies = array_values( $dependencies );
173 173
 
174 174
 		$styles->registered['wp-admin']->deps = $dependencies;
Please login to merge, or discard this patch.
classes/helpers/FrmStylesCardHelper.php 3 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -349,12 +349,12 @@
 block discarded – undo
349 349
 		array_walk(
350 350
 			$styles,
351 351
 			/**
352
-			* Echo a style card for a single style in the $styles array.
353
-			*
354
-			* @param WP_Post $style
355
-			* @param int     $count Used for pagination.
356
-			* @return void
357
-			*/
352
+			 * Echo a style card for a single style in the $styles array.
353
+			 *
354
+			 * @param WP_Post $style
355
+			 * @param int     $count Used for pagination.
356
+			 * @return void
357
+			 */
358 358
 			function( $style ) use ( &$count ) {
359 359
 				$hidden = $count > ( self::PAGE_SIZE - 1 );
360 360
 				$this->echo_style_card( $style, $hidden );
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@
 block discarded – undo
80 80
 	 * @param bool             $hidden
81 81
 	 * @return array
82 82
 	 */
83
-	private function get_params_for_style_card( $style, $hidden = false ) {	
83
+	private function get_params_for_style_card( $style, $hidden = false ) {
84 84
 		if ( ! empty( $style->post_content['position'] ) ) {
85 85
 			$label_position = $style->post_content['position'];
86 86
 		} else {
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -130,11 +130,11 @@  discard block
 block discarded – undo
130 130
 	private static function has_dark_background( $style ) {
131 131
 		$key = 'fieldset_bg_color';
132 132
 
133
-		if ( empty( $style->post_content[ $key ] ) ) {
133
+		if ( empty( $style->post_content[$key] ) ) {
134 134
 			return false;
135 135
 		}
136 136
 
137
-		$color = $style->post_content[ $key ];
137
+		$color = $style->post_content[$key];
138 138
 
139 139
 		if ( 0 === strpos( $color, 'rgba' ) ) {
140 140
 			preg_match_all( "/([\\d.]+)/", $color, $matches );
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
 					),
205 205
 					'/style-templates/' . $style['slug']
206 206
 				);
207
-				$params['data-requires']    = FrmFormsHelper::get_plan_required( $style );
207
+				$params['data-requires'] = FrmFormsHelper::get_plan_required( $style );
208 208
 				return $params;
209 209
 			};
210 210
 		} else {
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
 				continue;
262 262
 			}
263 263
 
264
-			$value = $style->post_content[ $key ];
264
+			$value = $style->post_content[$key];
265 265
 
266 266
 			if ( in_array( $key, $color_settings, true ) && $value && '#' !== $value[0] && false === strpos( $value, 'rgb' ) ) {
267 267
 				$value = '#' . $value;
@@ -408,7 +408,7 @@  discard block
 block discarded – undo
408 408
 			function( $style ) use ( &$count ) {
409 409
 				$hidden = $count > ( self::PAGE_SIZE - 1 );
410 410
 				$this->echo_style_card( $style, $hidden );
411
-				++$count;
411
+				++ $count;
412 412
 			}
413 413
 		);
414 414
 
Please login to merge, or discard this patch.
classes/controllers/FrmFormsController.php 2 patches
Braces   +14 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1697,7 +1697,8 @@  discard block
 block discarded – undo
1697 1697
 		$vars   = array();
1698 1698
 		FrmAppHelper::include_svg();
1699 1699
 
1700
-		if ( isset( $_POST['frm_compact_fields'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
1700
+		if ( isset( $_POST['frm_compact_fields'] ) ) {
1701
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
1701 1702
 			FrmAppHelper::permission_check( 'frm_edit_forms' );
1702 1703
 
1703 1704
 			// Javascript needs to be allowed in some field settings.
@@ -2007,7 +2008,8 @@  discard block
 block discarded – undo
2007 2008
 	private static function maybe_get_form_to_show( $id ) {
2008 2009
 		$form = false;
2009 2010
 
2010
-		if ( ! empty( $id ) ) { // form id or key is set
2011
+		if ( ! empty( $id ) ) {
2012
+// form id or key is set
2011 2013
 			$form = FrmForm::getOne( $id );
2012 2014
 			if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
2013 2015
 				$form = false;
@@ -2090,7 +2092,8 @@  discard block
 block discarded – undo
2090 2092
 	private static function get_saved_errors( $form, $params ) {
2091 2093
 		global $frm_vars;
2092 2094
 
2093
-		if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2095
+		if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) {
2096
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
2094 2097
 			$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2095 2098
 		} else {
2096 2099
 			$errors = array();
@@ -2243,7 +2246,8 @@  discard block
 block discarded – undo
2243 2246
 			}
2244 2247
 
2245 2248
 			if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) {
2246
-				if ( $has_redirect ) { // Do not process because we run the first redirect action only.
2249
+				if ( $has_redirect ) {
2250
+// Do not process because we run the first redirect action only.
2247 2251
 					continue;
2248 2252
 				}
2249 2253
 
@@ -2402,12 +2406,14 @@  discard block
 block discarded – undo
2402 2406
 
2403 2407
 		$doing_ajax = FrmAppHelper::doing_ajax();
2404 2408
 
2405
-		if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) { // Is AJAX submit and there is just one Redirect action runs.
2409
+		if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) {
2410
+// Is AJAX submit and there is just one Redirect action runs.
2406 2411
 			echo json_encode( array( 'redirect' => $success_url ) );
2407 2412
 			wp_die();
2408 2413
 		}
2409 2414
 
2410
-		if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) ) { // Not AJAX submit, no headers sent, and there is just one Redirect action runs.
2415
+		if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) ) {
2416
+// Not AJAX submit, no headers sent, and there is just one Redirect action runs.
2411 2417
 			wp_redirect( esc_url_raw( $success_url ) );
2412 2418
 			die(); // do not use wp_die or redirect fails
2413 2419
 		}
@@ -2432,7 +2438,8 @@  discard block
 block discarded – undo
2432 2438
 
2433 2439
 		echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2434 2440
 		echo '<script>';
2435
-		if ( empty( $args['doing_ajax'] ) ) { // Not AJAX submit, delay JS until window.load.
2441
+		if ( empty( $args['doing_ajax'] ) ) {
2442
+// Not AJAX submit, delay JS until window.load.
2436 2443
 			echo 'window.onload=function(){';
2437 2444
 		}
2438 2445
 		echo 'setTimeout(function(){window.location="' . esc_url_raw( $args['success_url'] ) . '";}, ' . intval( $delay_time ) . ');';
Please login to merge, or discard this patch.
Spacing   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -511,11 +511,11 @@  discard block
 block discarded – undo
511 511
 			),
512 512
 		);
513 513
 
514
-		if ( ! isset( $available_status[ $status ] ) ) {
514
+		if ( ! isset( $available_status[$status] ) ) {
515 515
 			return;
516 516
 		}
517 517
 
518
-		FrmAppHelper::permission_check( $available_status[ $status ]['permission'] );
518
+		FrmAppHelper::permission_check( $available_status[$status]['permission'] );
519 519
 
520 520
 		$params = FrmForm::list_page_params();
521 521
 
@@ -523,7 +523,7 @@  discard block
 block discarded – undo
523 523
 		check_admin_referer( $status . '_form_' . $params['id'] );
524 524
 
525 525
 		$count = 0;
526
-		if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
526
+		if ( FrmForm::set_status( $params['id'], $available_status[$status]['new_status'] ) ) {
527 527
 			$count ++;
528 528
 		}
529 529
 
@@ -540,7 +540,7 @@  discard block
 block discarded – undo
540 540
 		/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
541 541
 		$available_status['trash']['message']   = sprintf( _n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ), $count, '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=untrash&form_type=' . $form_type . '&id=' . $params['id'], 'untrash_form_' . $params['id'] ) ) . '">', '</a>' );
542 542
 
543
-		$message = $available_status[ $status ]['message'];
543
+		$message = $available_status[$status]['message'];
544 544
 
545 545
 		self::display_forms_list( $params, $message );
546 546
 	}
@@ -561,7 +561,7 @@  discard block
 block discarded – undo
561 561
 				'type'  => 'request',
562 562
 			)
563 563
 		);
564
-		$message      = sprintf(
564
+		$message = sprintf(
565 565
 			/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
566 566
 			_n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ),
567 567
 			$count,
@@ -984,11 +984,11 @@  discard block
 block discarded – undo
984 984
 			}
985 985
 
986 986
 			foreach ( $template['categories'] as $category ) {
987
-				if ( ! isset( $templates_by_category[ $category ] ) ) {
988
-					$templates_by_category[ $category ] = array();
987
+				if ( ! isset( $templates_by_category[$category] ) ) {
988
+					$templates_by_category[$category] = array();
989 989
 				}
990 990
 
991
-				$templates_by_category[ $category ][] = $template;
991
+				$templates_by_category[$category][] = $template;
992 992
 			}
993 993
 		}
994 994
 		unset( $template );
@@ -1017,7 +1017,7 @@  discard block
 block discarded – undo
1017 1017
 		$forms                    = FrmForm::get_published_forms( $where );
1018 1018
 		$view_path                = FrmAppHelper::plugin_path() . '/classes/views/frm-forms/';
1019 1019
 
1020
-		$templates_by_category[ $my_templates_translation ] = $custom_templates;
1020
+		$templates_by_category[$my_templates_translation] = $custom_templates;
1021 1021
 
1022 1022
 		unset( $pricing, $license_type, $where );
1023 1023
 		wp_enqueue_script( 'accordion' ); // register accordion for template groups
@@ -1260,7 +1260,7 @@  discard block
 block discarded – undo
1260 1260
 
1261 1261
 		foreach ( array( 'landing', 'chat' ) as $feature ) {
1262 1262
 			if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
1263
-				unset( $sections[ $feature ] );
1263
+				unset( $sections[$feature] );
1264 1264
 			}
1265 1265
 		}
1266 1266
 
@@ -1293,7 +1293,7 @@  discard block
 block discarded – undo
1293 1293
 				$section['id'] = $section['anchor'];
1294 1294
 			}
1295 1295
 
1296
-			$sections[ $key ] = $section;
1296
+			$sections[$key] = $section;
1297 1297
 		}
1298 1298
 
1299 1299
 		return $sections;
@@ -1411,7 +1411,7 @@  discard block
 block discarded – undo
1411 1411
 		if ( ! empty( $user_fields ) ) {
1412 1412
 			$user_helpers = array();
1413 1413
 			foreach ( $user_fields as $uk => $uf ) {
1414
-				$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1414
+				$user_helpers['|user_id| show="' . $uk . '"'] = $uf;
1415 1415
 				unset( $uk, $uf );
1416 1416
 			}
1417 1417
 
@@ -1543,7 +1543,7 @@  discard block
 block discarded – undo
1543 1543
 		if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
1544 1544
 			$frm_vars['js_validate_forms'] = array();
1545 1545
 		}
1546
-		$frm_vars['js_validate_forms'][ $form->id ] = $form;
1546
+		$frm_vars['js_validate_forms'][$form->id] = $form;
1547 1547
 	}
1548 1548
 
1549 1549
 	public static function get_email_html() {
@@ -1698,7 +1698,7 @@  discard block
 block discarded – undo
1698 1698
 				add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
1699 1699
 			} else {
1700 1700
 				$vars   = FrmAppHelper::json_to_array( $json_vars );
1701
-				$action = $vars[ $action ];
1701
+				$action = $vars[$action];
1702 1702
 				unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
1703 1703
 				$_REQUEST = array_merge( $_REQUEST, $vars ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
1704 1704
 				$_POST    = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
@@ -1832,7 +1832,7 @@  discard block
 block discarded – undo
1832 1832
 		$actions = array();
1833 1833
 		foreach ( $frm_vars['forms_loaded'] as $form ) {
1834 1834
 			if ( is_object( $form ) ) {
1835
-				$actions[ $form->id ] = $form->name;
1835
+				$actions[$form->id] = $form->name;
1836 1836
 			}
1837 1837
 			unset( $form );
1838 1838
 		}
@@ -2074,8 +2074,8 @@  discard block
 block discarded – undo
2074 2074
 	private static function get_saved_errors( $form, $params ) {
2075 2075
 		global $frm_vars;
2076 2076
 
2077
-		if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2078
-			$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2077
+		if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][$form->id] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2078
+			$errors = $frm_vars['created_entries'][$form->id]['errors'];
2079 2079
 		} else {
2080 2080
 			$errors = array();
2081 2081
 		}
@@ -2097,7 +2097,7 @@  discard block
 block discarded – undo
2097 2097
 	public static function just_created_entry( $form_id ) {
2098 2098
 		global $frm_vars;
2099 2099
 
2100
-		return ( isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][ $form_id ] ) && isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ) ? $frm_vars['created_entries'][ $form_id ]['entry_id'] : 0;
2100
+		return ( isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][$form_id] ) && isset( $frm_vars['created_entries'][$form_id]['entry_id'] ) ) ? $frm_vars['created_entries'][$form_id]['entry_id'] : 0;
2101 2101
 	}
2102 2102
 
2103 2103
 	/**
@@ -2121,7 +2121,7 @@  discard block
 block discarded – undo
2121 2121
 		}
2122 2122
 
2123 2123
 		$opt    = 'success_action';
2124
-		$method = ( isset( $atts['form']->options[ $opt ] ) && ! empty( $atts['form']->options[ $opt ] ) ) ? $atts['form']->options[ $opt ] : 'message';
2124
+		$method = ( isset( $atts['form']->options[$opt] ) && ! empty( $atts['form']->options[$opt] ) ) ? $atts['form']->options[$opt] : 'message';
2125 2125
 		$method = apply_filters( 'frm_success_filter', $method, $atts['form'], 'create' );
2126 2126
 
2127 2127
 		if ( $method != 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
@@ -2134,7 +2134,7 @@  discard block
 block discarded – undo
2134 2134
 	public static function maybe_trigger_redirect( $form, $params, $args ) {
2135 2135
 		if ( ! isset( $params['id'] ) ) {
2136 2136
 			global $frm_vars;
2137
-			$params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id'];
2137
+			$params['id'] = $frm_vars['created_entries'][$form->id]['entry_id'];
2138 2138
 		}
2139 2139
 
2140 2140
 		$conf_method = self::get_confirmation_method(
@@ -2193,7 +2193,7 @@  discard block
 block discarded – undo
2193 2193
 		$args['success_opt'] = $opt;
2194 2194
 		$args['ajax']        = ! empty( $frm_vars['ajax'] );
2195 2195
 
2196
-		if ( $args['conf_method'] === 'page' && is_numeric( $args['form']->options[ $opt . '_page_id' ] ) ) {
2196
+		if ( $args['conf_method'] === 'page' && is_numeric( $args['form']->options[$opt . '_page_id'] ) ) {
2197 2197
 			self::load_page_after_submit( $args );
2198 2198
 		} elseif ( $args['conf_method'] === 'redirect' ) {
2199 2199
 			self::redirect_after_submit( $args );
@@ -2335,7 +2335,7 @@  discard block
 block discarded – undo
2335 2335
 
2336 2336
 		$opt = 'update' === $args['action'] ? 'edit_' : 'success_';
2337 2337
 
2338
-		$new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ];
2338
+		$new_args['conf_method'] = $new_args['form']->options[$opt . 'action'];
2339 2339
 
2340 2340
 		/**
2341 2341
 		 * Filters the run success action args.
@@ -2355,8 +2355,8 @@  discard block
 block discarded – undo
2355 2355
 	private static function load_page_after_submit( $args ) {
2356 2356
 		global $post;
2357 2357
 		$opt = $args['success_opt'];
2358
-		if ( ! $post || $args['form']->options[ $opt . '_page_id' ] != $post->ID ) {
2359
-			$page     = get_post( $args['form']->options[ $opt . '_page_id' ] );
2358
+		if ( ! $post || $args['form']->options[$opt . '_page_id'] != $post->ID ) {
2359
+			$page     = get_post( $args['form']->options[$opt . '_page_id'] );
2360 2360
 			$old_post = $post;
2361 2361
 			$post     = $page;
2362 2362
 			$content  = apply_filters( 'frm_content', $page->post_content, $args['form'], $args['entry_id'] );
@@ -2378,7 +2378,7 @@  discard block
 block discarded – undo
2378 2378
 		add_filter( 'frm_use_wpautop', '__return_false' );
2379 2379
 
2380 2380
 		$opt         = $args['success_opt'];
2381
-		$success_url = trim( $args['form']->options[ $opt . '_url' ] );
2381
+		$success_url = trim( $args['form']->options[$opt . '_url'] );
2382 2382
 		$success_url = apply_filters( 'frm_content', $success_url, $args['form'], $args['entry_id'] );
2383 2383
 		$success_url = do_shortcode( $success_url );
2384 2384
 
@@ -2550,7 +2550,7 @@  discard block
 block discarded – undo
2550 2550
 			'description' => false,
2551 2551
 			'reset'       => false,
2552 2552
 		);
2553
-		$args     = wp_parse_args( $args, $defaults );
2553
+		$args = wp_parse_args( $args, $defaults );
2554 2554
 	}
2555 2555
 
2556 2556
 	/**
@@ -2805,7 +2805,7 @@  discard block
 block discarded – undo
2805 2805
 
2806 2806
 		check_ajax_referer( 'frm_ajax', 'nonce' );
2807 2807
 
2808
-		$html             = FrmAppHelper::clip(
2808
+		$html = FrmAppHelper::clip(
2809 2809
 			function() {
2810 2810
 				FrmAppHelper::maybe_autocomplete_pages_options(
2811 2811
 					array(
@@ -2837,25 +2837,25 @@  discard block
 block discarded – undo
2837 2837
 	public static function populate_on_submit_data( &$form_options, $action = null, $event = 'create' ) {
2838 2838
 		$opt = 'update' === $event ? 'edit_' : 'success_';
2839 2839
 		if ( ! $action || ! is_object( $action ) ) {
2840
-			$form_options[ $opt . 'action' ] = FrmOnSubmitHelper::get_default_action_type();
2841
-			$form_options[ $opt . 'msg' ]    = FrmOnSubmitHelper::get_default_msg();
2840
+			$form_options[$opt . 'action'] = FrmOnSubmitHelper::get_default_action_type();
2841
+			$form_options[$opt . 'msg']    = FrmOnSubmitHelper::get_default_msg();
2842 2842
 			return;
2843 2843
 		}
2844 2844
 
2845
-		$form_options[ $opt . 'action' ] = isset( $action->post_content['success_action'] ) ? $action->post_content['success_action'] : 'message';
2845
+		$form_options[$opt . 'action'] = isset( $action->post_content['success_action'] ) ? $action->post_content['success_action'] : 'message';
2846 2846
 
2847
-		switch ( $form_options[ $opt . 'action' ] ) {
2847
+		switch ( $form_options[$opt . 'action'] ) {
2848 2848
 			case 'redirect':
2849
-				$form_options[ $opt . 'url' ] = isset( $action->post_content['success_url'] ) ? $action->post_content['success_url'] : '';
2849
+				$form_options[$opt . 'url'] = isset( $action->post_content['success_url'] ) ? $action->post_content['success_url'] : '';
2850 2850
 				break;
2851 2851
 
2852 2852
 			case 'page':
2853
-				$form_options[ $opt . 'page_id' ] = isset( $action->post_content['success_page_id'] ) ? $action->post_content['success_page_id'] : '';
2853
+				$form_options[$opt . 'page_id'] = isset( $action->post_content['success_page_id'] ) ? $action->post_content['success_page_id'] : '';
2854 2854
 				break;
2855 2855
 
2856 2856
 			default:
2857
-				$form_options[ $opt . 'msg' ] = ! empty( $action->post_content['success_msg'] ) ? $action->post_content['success_msg'] : FrmOnSubmitHelper::get_default_msg();
2858
-				$form_options['show_form']   = ! empty( $action->post_content['show_form'] );
2857
+				$form_options[$opt . 'msg'] = ! empty( $action->post_content['success_msg'] ) ? $action->post_content['success_msg'] : FrmOnSubmitHelper::get_default_msg();
2858
+				$form_options['show_form'] = ! empty( $action->post_content['show_form'] );
2859 2859
 		}
2860 2860
 	}
2861 2861
 
@@ -2876,7 +2876,7 @@  discard block
 block discarded – undo
2876 2876
 		FrmAppHelper::unserialize_or_decode( $form->options );
2877 2877
 
2878 2878
 		$flag_key = 'on_submit_migrated';
2879
-		if ( ! empty( $form->options[ $flag_key ] ) ) {
2879
+		if ( ! empty( $form->options[$flag_key] ) ) {
2880 2880
 			return;
2881 2881
 		}
2882 2882
 
@@ -2920,7 +2920,7 @@  discard block
 block discarded – undo
2920 2920
 		$action['post_content'] = FrmAppHelper::prepare_and_encode( $action['post_content'] );
2921 2921
 		FrmDb::save_json_post( $action );
2922 2922
 
2923
-		$form->options[ $flag_key ] = 1;
2923
+		$form->options[$flag_key] = 1;
2924 2924
 		FrmForm::update( $form->id, array( 'options' => $form->options ) );
2925 2925
 	}
2926 2926
 
@@ -2936,20 +2936,20 @@  discard block
 block discarded – undo
2936 2936
 	private static function get_on_submit_action_data_from_form_options( $form_options, $event = 'create' ) {
2937 2937
 		$opt  = 'update' === $event ? 'edit_' : 'success_';
2938 2938
 		$data = array(
2939
-			'success_action' => $form_options[ $opt . 'action' ],
2939
+			'success_action' => $form_options[$opt . 'action'],
2940 2940
 		);
2941 2941
 
2942
-		switch ( $form_options[ $opt . 'action' ] ) {
2942
+		switch ( $form_options[$opt . 'action'] ) {
2943 2943
 			case 'redirect':
2944
-				$data['success_url'] = isset( $form_options[ $opt . 'url' ] ) ? $form_options[ $opt . 'url' ] : '';
2944
+				$data['success_url'] = isset( $form_options[$opt . 'url'] ) ? $form_options[$opt . 'url'] : '';
2945 2945
 				break;
2946 2946
 
2947 2947
 			case 'page':
2948
-				$data['success_page_id'] = isset( $form_options[ $opt . 'page_id' ] ) ? $form_options[ $opt . 'page_id' ] : '';
2948
+				$data['success_page_id'] = isset( $form_options[$opt . 'page_id'] ) ? $form_options[$opt . 'page_id'] : '';
2949 2949
 				break;
2950 2950
 
2951 2951
 			default:
2952
-				$data['success_msg'] = isset( $form_options[ $opt . 'msg' ] ) ? $form_options[ $opt . 'msg' ] : FrmOnSubmitHelper::get_default_msg();
2952
+				$data['success_msg'] = isset( $form_options[$opt . 'msg'] ) ? $form_options[$opt . 'msg'] : FrmOnSubmitHelper::get_default_msg();
2953 2953
 				$data['show_form']   = ! empty( $form_options['show_form'] );
2954 2954
 		}
2955 2955
 
Please login to merge, or discard this patch.
classes/helpers/FrmAppHelper.php 1 patch
Spacing   +77 added lines, -77 removed lines patch added patch discarded remove patch
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
 			'fill'   => '#4d4d4d',
163 163
 			'orange' => '#f05a24',
164 164
 		);
165
-		$atts     = array_merge( $defaults, $atts );
165
+		$atts = array_merge( $defaults, $atts );
166 166
 
167 167
 		return '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 599.68 601.37" width="' . esc_attr( $atts['width'] ) . '" height="' . esc_attr( $atts['height'] ) . '">
168 168
 			<path fill="' . esc_attr( $atts['orange'] ) . '" d="M289.6 384h140v76h-140z"/>
@@ -369,7 +369,7 @@  discard block
 block discarded – undo
369 369
 	 * @return string
370 370
 	 */
371 371
 	public static function get_server_value( $value ) {
372
-		return isset( $_SERVER[ $value ] ) ? wp_strip_all_tags( wp_unslash( $_SERVER[ $value ] ) ) : '';
372
+		return isset( $_SERVER[$value] ) ? wp_strip_all_tags( wp_unslash( $_SERVER[$value] ) ) : '';
373 373
 	}
374 374
 
375 375
 	/**
@@ -392,7 +392,7 @@  discard block
 block discarded – undo
392 392
 		);
393 393
 		$ip = '';
394 394
 		foreach ( $ip_options as $key ) {
395
-			if ( ! isset( $_SERVER[ $key ] ) ) {
395
+			if ( ! isset( $_SERVER[$key] ) ) {
396 396
 				continue;
397 397
 			}
398 398
 
@@ -416,10 +416,10 @@  discard block
 block discarded – undo
416 416
 		}
417 417
 
418 418
 		if ( $src === 'get' ) {
419
-			$value = isset( $_POST[ $param ] ) ? wp_unslash( $_POST[ $param ] ) : ( isset( $_GET[ $param ] ) ? wp_unslash( $_GET[ $param ] ) : $default ); // phpcs:ignore WordPress.Security.NonceVerification.Missing, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
420
-			if ( ! isset( $_POST[ $param ] ) && isset( $_GET[ $param ] ) && ! is_array( $value ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
419
+			$value = isset( $_POST[$param] ) ? wp_unslash( $_POST[$param] ) : ( isset( $_GET[$param] ) ? wp_unslash( $_GET[$param] ) : $default ); // phpcs:ignore WordPress.Security.NonceVerification.Missing, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
420
+			if ( ! isset( $_POST[$param] ) && isset( $_GET[$param] ) && ! is_array( $value ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
421 421
 				// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
422
-				$value = htmlspecialchars_decode( wp_unslash( $_GET[ $param ] ) );
422
+				$value = htmlspecialchars_decode( wp_unslash( $_GET[$param] ) );
423 423
 			}
424 424
 			self::sanitize_value( $sanitize, $value );
425 425
 		} else {
@@ -440,7 +440,7 @@  discard block
 block discarded – undo
440 440
 				}
441 441
 
442 442
 				$p     = trim( $p, ']' );
443
-				$value = isset( $value[ $p ] ) ? $value[ $p ] : $default;
443
+				$value = isset( $value[$p] ) ? $value[$p] : $default;
444 444
 			}
445 445
 		}
446 446
 
@@ -496,26 +496,26 @@  discard block
 block discarded – undo
496 496
 			'sanitize' => 'sanitize_text_field',
497 497
 			'serialized' => false,
498 498
 		);
499
-		$args     = wp_parse_args( $args, $defaults );
499
+		$args = wp_parse_args( $args, $defaults );
500 500
 
501 501
 		$value = $args['default'];
502 502
 		if ( $args['type'] == 'get' ) {
503
-			if ( $_GET && isset( $_GET[ $args['param'] ] ) ) {
503
+			if ( $_GET && isset( $_GET[$args['param']] ) ) {
504 504
 				// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
505
-				$value = wp_unslash( $_GET[ $args['param'] ] );
505
+				$value = wp_unslash( $_GET[$args['param']] );
506 506
 			}
507 507
 		} elseif ( $args['type'] == 'post' ) {
508
-			if ( isset( $_POST[ $args['param'] ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
508
+			if ( isset( $_POST[$args['param']] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
509 509
 				// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
510
-				$value = wp_unslash( $_POST[ $args['param'] ] );
510
+				$value = wp_unslash( $_POST[$args['param']] );
511 511
 				if ( $args['serialized'] === true && is_serialized_string( $value ) && is_serialized( $value ) ) {
512 512
 					self::unserialize_or_decode( $value );
513 513
 				}
514 514
 			}
515 515
 		} else {
516
-			if ( isset( $_REQUEST[ $args['param'] ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
516
+			if ( isset( $_REQUEST[$args['param']] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
517 517
 				// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
518
-				$value = wp_unslash( $_REQUEST[ $args['param'] ] );
518
+				$value = wp_unslash( $_REQUEST[$args['param']] );
519 519
 			}
520 520
 		}
521 521
 
@@ -547,7 +547,7 @@  discard block
 block discarded – undo
547 547
 			if ( is_array( $value ) ) {
548 548
 				$temp_values = $value;
549 549
 				foreach ( $temp_values as $k => $v ) {
550
-					self::sanitize_value( $sanitize, $value[ $k ] );
550
+					self::sanitize_value( $sanitize, $value[$k] );
551 551
 				}
552 552
 			} else {
553 553
 				$value = call_user_func( $sanitize, $value );
@@ -558,8 +558,8 @@  discard block
 block discarded – undo
558 558
 	public static function sanitize_request( $sanitize_method, &$values ) {
559 559
 		$temp_values = $values;
560 560
 		foreach ( $temp_values as $k => $val ) {
561
-			if ( isset( $sanitize_method[ $k ] ) ) {
562
-				$values[ $k ] = call_user_func( $sanitize_method[ $k ], $val );
561
+			if ( isset( $sanitize_method[$k] ) ) {
562
+				$values[$k] = call_user_func( $sanitize_method[$k], $val );
563 563
 			}
564 564
 		}
565 565
 	}
@@ -582,7 +582,7 @@  discard block
 block discarded – undo
582 582
 		if ( is_array( $value ) ) {
583 583
 			$temp_values = $value;
584 584
 			foreach ( $temp_values as $k => $v ) {
585
-				self::decode_specialchars( $value[ $k ] );
585
+				self::decode_specialchars( $value[$k] );
586 586
 			}
587 587
 		} else {
588 588
 			self::decode_amp( $value );
@@ -702,7 +702,7 @@  discard block
 block discarded – undo
702 702
 	 * @return array
703 703
 	 */
704 704
 	public static function add_allowed_submit_button_tags( $allowed_html ) {
705
-		$allowed_html['input']                    = array(
705
+		$allowed_html['input'] = array(
706 706
 			'type'           => true,
707 707
 			'value'          => true,
708 708
 			'formnovalidate' => true,
@@ -725,7 +725,7 @@  discard block
 block discarded – undo
725 725
 			$allowed_html = $html;
726 726
 		} elseif ( ! empty( $allowed ) ) {
727 727
 			foreach ( (array) $allowed as $a ) {
728
-				$allowed_html[ $a ] = isset( $html[ $a ] ) ? $html[ $a ] : array();
728
+				$allowed_html[$a] = isset( $html[$a] ) ? $html[$a] : array();
729 729
 			}
730 730
 		}
731 731
 
@@ -904,8 +904,8 @@  discard block
 block discarded – undo
904 904
 		}
905 905
 
906 906
 		global $wp_query;
907
-		if ( isset( $wp_query->query_vars[ $param ] ) ) {
908
-			$value = $wp_query->query_vars[ $param ];
907
+		if ( isset( $wp_query->query_vars[$param] ) ) {
908
+			$value = $wp_query->query_vars[$param];
909 909
 		}
910 910
 
911 911
 		return $value;
@@ -932,9 +932,9 @@  discard block
 block discarded – undo
932 932
 		$deprecated = array(
933 933
 			'frm_clone_solid_icon' => 'frm_clone_icon',
934 934
 		);
935
-		if ( isset( $deprecated[ $icon ] ) ) {
936
-			$icon = $deprecated[ $icon ];
937
-			$class = str_replace( $icon, $deprecated[ $icon ], $class );
935
+		if ( isset( $deprecated[$icon] ) ) {
936
+			$icon = $deprecated[$icon];
937
+			$class = str_replace( $icon, $deprecated[$icon], $class );
938 938
 		}
939 939
 
940 940
 		if ( $icon === $class ) {
@@ -1255,7 +1255,7 @@  discard block
 block discarded – undo
1255 1255
 				'new_file_path' => self::plugin_path() . '/js',
1256 1256
 			)
1257 1257
 		);
1258
-		$new_file  = new FrmCreateFile( $file_atts );
1258
+		$new_file = new FrmCreateFile( $file_atts );
1259 1259
 
1260 1260
 		$files = array(
1261 1261
 			self::plugin_path() . '/js/formidable.min.js',
@@ -1717,8 +1717,8 @@  discard block
 block discarded – undo
1717 1717
 			return $error;
1718 1718
 		}
1719 1719
 
1720
-		$nonce_value = ( $_REQUEST && isset( $_REQUEST[ $nonce_name ] ) ) ? sanitize_text_field( wp_unslash( $_REQUEST[ $nonce_name ] ) ) : '';
1721
-		if ( $_REQUEST && ( ! isset( $_REQUEST[ $nonce_name ] ) || ! wp_verify_nonce( $nonce_value, $nonce ) ) ) {
1720
+		$nonce_value = ( $_REQUEST && isset( $_REQUEST[$nonce_name] ) ) ? sanitize_text_field( wp_unslash( $_REQUEST[$nonce_name] ) ) : '';
1721
+		if ( $_REQUEST && ( ! isset( $_REQUEST[$nonce_name] ) || ! wp_verify_nonce( $nonce_value, $nonce ) ) ) {
1722 1722
 			$frm_settings = self::get_settings();
1723 1723
 			$error        = $frm_settings->admin_permission;
1724 1724
 		}
@@ -1753,7 +1753,7 @@  discard block
 block discarded – undo
1753 1753
 			} else {
1754 1754
 				foreach ( $value as $k => $v ) {
1755 1755
 					if ( ! is_array( $v ) ) {
1756
-						$value[ $k ] = call_user_func( $original_function, $v );
1756
+						$value[$k] = call_user_func( $original_function, $v );
1757 1757
 					}
1758 1758
 				}
1759 1759
 			}
@@ -1778,7 +1778,7 @@  discard block
 block discarded – undo
1778 1778
 				$return = array_merge( $return, self::array_flatten( $value, $keys ) );
1779 1779
 			} else {
1780 1780
 				if ( $keys == 'keep' ) {
1781
-					$return[ $key ] = $value;
1781
+					$return[$key] = $value;
1782 1782
 				} else {
1783 1783
 					$return[] = $value;
1784 1784
 				}
@@ -1831,11 +1831,11 @@  discard block
 block discarded – undo
1831 1831
 		}
1832 1832
 
1833 1833
 		$ver = $default;
1834
-		if ( ! isset( $wp_scripts->registered[ $handle ] ) ) {
1834
+		if ( ! isset( $wp_scripts->registered[$handle] ) ) {
1835 1835
 			return $ver;
1836 1836
 		}
1837 1837
 
1838
-		$query = $wp_scripts->registered[ $handle ];
1838
+		$query = $wp_scripts->registered[$handle];
1839 1839
 		if ( is_object( $query ) && ! empty( $query->ver ) ) {
1840 1840
 			$ver = $query->ver;
1841 1841
 		}
@@ -1941,7 +1941,7 @@  discard block
 block discarded – undo
1941 1941
 			$suffix = 2;
1942 1942
 			do {
1943 1943
 				$key_check = $key . $separator . $suffix;
1944
-				++$suffix;
1944
+				++ $suffix;
1945 1945
 			} while ( in_array( $key_check, $similar_keys, true ) );
1946 1946
 
1947 1947
 			$key = $key_check;
@@ -2042,7 +2042,7 @@  discard block
 block discarded – undo
2042 2042
 
2043 2043
 		foreach ( array( 'name', 'description' ) as $var ) {
2044 2044
 			$default_val    = isset( $record->{$var} ) ? $record->{$var} : '';
2045
-			$values[ $var ] = self::get_param( $var, $default_val, 'get', 'wp_kses_post' );
2045
+			$values[$var] = self::get_param( $var, $default_val, 'get', 'wp_kses_post' );
2046 2046
 			unset( $var, $default_val );
2047 2047
 		}
2048 2048
 
@@ -2100,9 +2100,9 @@  discard block
 block discarded – undo
2100 2100
 			}
2101 2101
 		}
2102 2102
 
2103
-		$field_type = isset( $post_values['field_options'][ 'type_' . $field->id ] ) ? $post_values['field_options'][ 'type_' . $field->id ] : $field->type;
2104
-		if ( isset( $post_values['item_meta'][ $field->id ] ) ) {
2105
-			$new_value = $post_values['item_meta'][ $field->id ];
2103
+		$field_type = isset( $post_values['field_options']['type_' . $field->id] ) ? $post_values['field_options']['type_' . $field->id] : $field->type;
2104
+		if ( isset( $post_values['item_meta'][$field->id] ) ) {
2105
+			$new_value = $post_values['item_meta'][$field->id];
2106 2106
 			self::unserialize_or_decode( $new_value );
2107 2107
 		} else {
2108 2108
 			$new_value = $meta_value;
@@ -2123,7 +2123,7 @@  discard block
 block discarded – undo
2123 2123
 
2124 2124
 		$field_array = array_merge( (array) $field->field_options, $field_array );
2125 2125
 
2126
-		$values['fields'][ $field->id ] = $field_array;
2126
+		$values['fields'][$field->id] = $field_array;
2127 2127
 	}
2128 2128
 
2129 2129
 	/**
@@ -2170,11 +2170,11 @@  discard block
 block discarded – undo
2170 2170
 		}
2171 2171
 
2172 2172
 		foreach ( $form->options as $opt => $value ) {
2173
-			if ( isset( $post_values[ $opt ] ) ) {
2174
-				$values[ $opt ] = $post_values[ $opt ];
2175
-				self::unserialize_or_decode( $values[ $opt ] );
2173
+			if ( isset( $post_values[$opt] ) ) {
2174
+				$values[$opt] = $post_values[$opt];
2175
+				self::unserialize_or_decode( $values[$opt] );
2176 2176
 			} else {
2177
-				$values[ $opt ] = $value;
2177
+				$values[$opt] = $value;
2178 2178
 			}
2179 2179
 		}
2180 2180
 
@@ -2188,8 +2188,8 @@  discard block
 block discarded – undo
2188 2188
 		$form_defaults = FrmFormsHelper::get_default_opts();
2189 2189
 
2190 2190
 		foreach ( $form_defaults as $opt => $default ) {
2191
-			if ( ! isset( $values[ $opt ] ) || $values[ $opt ] == '' ) {
2192
-				$values[ $opt ] = ( $post_values && isset( $post_values['options'][ $opt ] ) ) ? $post_values['options'][ $opt ] : $default;
2191
+			if ( ! isset( $values[$opt] ) || $values[$opt] == '' ) {
2192
+				$values[$opt] = ( $post_values && isset( $post_values['options'][$opt] ) ) ? $post_values['options'][$opt] : $default;
2193 2193
 			}
2194 2194
 
2195 2195
 			unset( $opt, $default );
@@ -2200,8 +2200,8 @@  discard block
 block discarded – undo
2200 2200
 		}
2201 2201
 
2202 2202
 		foreach ( array( 'before', 'after', 'submit' ) as $h ) {
2203
-			if ( ! isset( $values[ $h . '_html' ] ) ) {
2204
-				$values[ $h . '_html' ] = ( isset( $post_values['options'][ $h . '_html' ] ) ? $post_values['options'][ $h . '_html' ] : FrmFormsHelper::get_default_html( $h ) );
2203
+			if ( ! isset( $values[$h . '_html'] ) ) {
2204
+				$values[$h . '_html'] = ( isset( $post_values['options'][$h . '_html'] ) ? $post_values['options'][$h . '_html'] : FrmFormsHelper::get_default_html( $h ) );
2205 2205
 			}
2206 2206
 			unset( $h );
2207 2207
 		}
@@ -2353,25 +2353,25 @@  discard block
 block discarded – undo
2353 2353
 		if ( ! is_numeric( $levels ) ) {
2354 2354
 			// Show time in specified unit.
2355 2355
 			$levels = self::get_unit( $levels );
2356
-			if ( isset( $time_strings[ $levels ] ) ) {
2356
+			if ( isset( $time_strings[$levels] ) ) {
2357 2357
 				$diff = array(
2358 2358
 					$levels => self::time_format( $levels, $diff ),
2359 2359
 				);
2360 2360
 				$time_strings = array(
2361
-					$levels => $time_strings[ $levels ],
2361
+					$levels => $time_strings[$levels],
2362 2362
 				);
2363 2363
 			}
2364 2364
 			$levels = 1;
2365 2365
 		}
2366 2366
 
2367 2367
 		foreach ( $time_strings as $k => $v ) {
2368
-			if ( isset( $diff[ $k ] ) && $diff[ $k ] ) {
2369
-				$time_strings[ $k ] = $diff[ $k ] . ' ' . ( $diff[ $k ] > 1 ? $v[1] : $v[0] );
2370
-			} elseif ( isset( $diff[ $k ] ) && count( $time_strings ) === 1 ) {
2368
+			if ( isset( $diff[$k] ) && $diff[$k] ) {
2369
+				$time_strings[$k] = $diff[$k] . ' ' . ( $diff[$k] > 1 ? $v[1] : $v[0] );
2370
+			} elseif ( isset( $diff[$k] ) && count( $time_strings ) === 1 ) {
2371 2371
 				// Account for 0.
2372
-				$time_strings[ $k ] = $diff[ $k ] . ' ' . $v[1];
2372
+				$time_strings[$k] = $diff[$k] . ' ' . $v[1];
2373 2373
 			} else {
2374
-				unset( $time_strings[ $k ] );
2374
+				unset( $time_strings[$k] );
2375 2375
 			}
2376 2376
 		}
2377 2377
 
@@ -2390,8 +2390,8 @@  discard block
 block discarded – undo
2390 2390
 			'y' => 'y',
2391 2391
 			'd' => 'days',
2392 2392
 		);
2393
-		if ( isset( $return[ $unit ] ) ) {
2394
-			return $diff[ $return[ $unit ] ];
2393
+		if ( isset( $return[$unit] ) ) {
2394
+			return $diff[$return[$unit]];
2395 2395
 		}
2396 2396
 
2397 2397
 		$total = $diff['days'] * self::convert_time( 'd', $unit );
@@ -2399,11 +2399,11 @@  discard block
 block discarded – undo
2399 2399
 		$times = array( 'h', 'i', 's' );
2400 2400
 
2401 2401
 		foreach ( $times as $time ) {
2402
-			if ( ! isset( $diff[ $time ] ) ) {
2402
+			if ( ! isset( $diff[$time] ) ) {
2403 2403
 				continue;
2404 2404
 			}
2405 2405
 
2406
-			$total += $diff[ $time ] * self::convert_time( $time, $unit );
2406
+			$total += $diff[$time] * self::convert_time( $time, $unit );
2407 2407
 		}
2408 2408
 
2409 2409
 		return floor( $total );
@@ -2423,7 +2423,7 @@  discard block
 block discarded – undo
2423 2423
 			'y' => DAY_IN_SECONDS * 365.25,
2424 2424
 		);
2425 2425
 
2426
-		return $convert[ $from ] / $convert[ $to ];
2426
+		return $convert[$from] / $convert[$to];
2427 2427
 	}
2428 2428
 
2429 2429
 	/**
@@ -2431,7 +2431,7 @@  discard block
 block discarded – undo
2431 2431
 	 */
2432 2432
 	private static function get_unit( $unit ) {
2433 2433
 		$units = self::get_time_strings();
2434
-		if ( isset( $units[ $unit ] ) || is_numeric( $unit ) ) {
2434
+		if ( isset( $units[$unit] ) || is_numeric( $unit ) ) {
2435 2435
 			return $unit;
2436 2436
 		}
2437 2437
 
@@ -2542,17 +2542,17 @@  discard block
 block discarded – undo
2542 2542
 
2543 2543
 					case 1:
2544 2544
 						$l2 = $name;
2545
-						self::add_value_to_array( $name, $l2, $this_val, $vars[ $l1 ] );
2545
+						self::add_value_to_array( $name, $l2, $this_val, $vars[$l1] );
2546 2546
 						break;
2547 2547
 
2548 2548
 					case 2:
2549 2549
 						$l3 = $name;
2550
-						self::add_value_to_array( $name, $l3, $this_val, $vars[ $l1 ][ $l2 ] );
2550
+						self::add_value_to_array( $name, $l3, $this_val, $vars[$l1][$l2] );
2551 2551
 						break;
2552 2552
 
2553 2553
 					case 3:
2554 2554
 						$l4 = $name;
2555
-						self::add_value_to_array( $name, $l4, $this_val, $vars[ $l1 ][ $l2 ][ $l3 ] );
2555
+						self::add_value_to_array( $name, $l4, $this_val, $vars[$l1][$l2][$l3] );
2556 2556
 				}
2557 2557
 
2558 2558
 				unset( $this_val, $n );
@@ -2571,8 +2571,8 @@  discard block
 block discarded – undo
2571 2571
 	public static function add_value_to_array( $name, $l1, $val, &$vars ) {
2572 2572
 		if ( $name == '' ) {
2573 2573
 			$vars[] = $val;
2574
-		} elseif ( ! isset( $vars[ $l1 ] ) ) {
2575
-			$vars[ $l1 ] = $val;
2574
+		} elseif ( ! isset( $vars[$l1] ) ) {
2575
+			$vars[$l1] = $val;
2576 2576
 		}
2577 2577
 	}
2578 2578
 
@@ -2588,7 +2588,7 @@  discard block
 block discarded – undo
2588 2588
 			'email_subject' => esc_attr( sprintf( __( 'If you leave the subject blank, the default will be used: %1$s Form submitted on %2$s', 'formidable' ), $form_name, self::site_name() ) ),
2589 2589
 		);
2590 2590
 
2591
-		if ( ! isset( $tooltips[ $name ] ) ) {
2591
+		if ( ! isset( $tooltips[$name] ) ) {
2592 2592
 			return;
2593 2593
 		}
2594 2594
 
@@ -2598,7 +2598,7 @@  discard block
 block discarded – undo
2598 2598
 			echo ' class="frm_help"';
2599 2599
 		}
2600 2600
 
2601
-		echo ' title="' . esc_attr( $tooltips[ $name ] );
2601
+		echo ' title="' . esc_attr( $tooltips[$name] );
2602 2602
 
2603 2603
 		if ( 'open' != $class ) {
2604 2604
 			echo '"';
@@ -2657,13 +2657,13 @@  discard block
 block discarded – undo
2657 2657
 	}
2658 2658
 
2659 2659
 	private static function prepare_action_slashes( $val, $key, &$post_content ) {
2660
-		if ( ! isset( $post_content[ $key ] ) || is_numeric( $val ) ) {
2660
+		if ( ! isset( $post_content[$key] ) || is_numeric( $val ) ) {
2661 2661
 			return;
2662 2662
 		}
2663 2663
 
2664 2664
 		if ( is_array( $val ) ) {
2665 2665
 			foreach ( $val as $k1 => $v1 ) {
2666
-				self::prepare_action_slashes( $v1, $k1, $post_content[ $key ] );
2666
+				self::prepare_action_slashes( $v1, $k1, $post_content[$key] );
2667 2667
 				unset( $k1, $v1 );
2668 2668
 			}
2669 2669
 		} else {
@@ -2671,7 +2671,7 @@  discard block
 block discarded – undo
2671 2671
 			$val = stripslashes( $val );
2672 2672
 
2673 2673
 			// Add backslashes before double quotes and forward slashes only
2674
-			$post_content[ $key ] = addcslashes( $val, '"\\/' );
2674
+			$post_content[$key] = addcslashes( $val, '"\\/' );
2675 2675
 		}
2676 2676
 	}
2677 2677
 
@@ -2734,14 +2734,14 @@  discard block
 block discarded – undo
2734 2734
 				continue;
2735 2735
 			}
2736 2736
 			$key = $input['name'];
2737
-			if ( isset( $formatted[ $key ] ) ) {
2738
-				if ( is_array( $formatted[ $key ] ) ) {
2739
-					$formatted[ $key ][] = $input['value'];
2737
+			if ( isset( $formatted[$key] ) ) {
2738
+				if ( is_array( $formatted[$key] ) ) {
2739
+					$formatted[$key][] = $input['value'];
2740 2740
 				} else {
2741
-					$formatted[ $key ] = array( $formatted[ $key ], $input['value'] );
2741
+					$formatted[$key] = array( $formatted[$key], $input['value'] );
2742 2742
 				}
2743 2743
 			} else {
2744
-				$formatted[ $key ] = $input['value'];
2744
+				$formatted[$key] = $input['value'];
2745 2745
 			}
2746 2746
 		}
2747 2747
 
@@ -3403,8 +3403,8 @@  discard block
 block discarded – undo
3403 3403
 		}
3404 3404
 
3405 3405
 		foreach ( $keys as $key ) {
3406
-			if ( isset( $values[ $key ] ) ) {
3407
-				$values[ $key ] = self::kses( $values[ $key ], 'all' );
3406
+			if ( isset( $values[$key] ) ) {
3407
+				$values[$key] = self::kses( $values[$key], 'all' );
3408 3408
 			}
3409 3409
 		}
3410 3410
 
@@ -3563,7 +3563,7 @@  discard block
 block discarded – undo
3563 3563
 			return 0;
3564 3564
 		}
3565 3565
 
3566
-		return strlen( $parts[ count( $parts ) - 1 ] );
3566
+		return strlen( $parts[count( $parts ) - 1] );
3567 3567
 	}
3568 3568
 
3569 3569
 	/**
Please login to merge, or discard this patch.
classes/models/FrmStyleApi.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@
 block discarded – undo
50 50
 		// Remove 'Styling Template' from titles.
51 51
 		foreach ( $api_info as $id => $template ) {
52 52
 			if ( isset( $template['name'] ) ) {
53
-				$api_info[ $id ]['name'] = preg_replace( '/(\sStyle|Styling)?(\sTemplate)?$/', '', $template['name'] );
53
+				$api_info[$id]['name'] = preg_replace( '/(\sStyle|Styling)?(\sTemplate)?$/', '', $template['name'] );
54 54
 			}
55 55
 		}
56 56
 
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
@@ -132,8 +132,8 @@  discard block
 block discarded – undo
132 132
 		$field_val = '';
133 133
 		if ( is_object( $this->field ) ) {
134 134
 			$field_val = $this->field->{$column};
135
-		} elseif ( is_array( $this->field ) && isset( $this->field[ $column ] ) ) {
136
-			$field_val = $this->field[ $column ];
135
+		} elseif ( is_array( $this->field ) && isset( $this->field[$column] ) ) {
136
+			$field_val = $this->field[$column];
137 137
 		}
138 138
 
139 139
 		return $field_val;
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 		if ( is_object( $this->field ) ) {
148 148
 			$this->field->{$column} = $value;
149 149
 		} elseif ( is_array( $this->field ) ) {
150
-			$this->field[ $column ] = $value;
150
+			$this->field[$column] = $value;
151 151
 		}
152 152
 	}
153 153
 
@@ -527,7 +527,7 @@  discard block
 block discarded – undo
527 527
 			printf(
528 528
 				/* translators: %s: Field type */
529 529
 				esc_html__( '%s Options', 'formidable' ),
530
-				esc_html( $all_field_types[ $args['display']['type'] ]['name'] )
530
+				esc_html( $all_field_types[$args['display']['type']]['name'] )
531 531
 			);
532 532
 			FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown6_icon', array( 'aria-hidden' => 'true' ) );
533 533
 			?>
@@ -650,8 +650,8 @@  discard block
 block discarded – undo
650 650
 		$fields = FrmField::field_selection();
651 651
 		$fields = array_merge( $fields, FrmField::pro_field_selection() );
652 652
 
653
-		if ( isset( $fields[ $this->type ] ) ) {
654
-			$name = is_array( $fields[ $this->type ] ) ? $fields[ $this->type ]['name'] : $fields[ $this->type ];
653
+		if ( isset( $fields[$this->type] ) ) {
654
+			$name = is_array( $fields[$this->type] ) ? $fields[$this->type]['name'] : $fields[$this->type];
655 655
 		}
656 656
 
657 657
 		return $name;
@@ -662,7 +662,7 @@  discard block
 block discarded – undo
662 662
 	}
663 663
 
664 664
 	public function get_default_field_options() {
665
-		$opts       = array(
665
+		$opts = array(
666 666
 			'size'               => '',
667 667
 			'max'                => '',
668 668
 			'label'              => '',
@@ -1004,7 +1004,7 @@  discard block
 block discarded – undo
1004 1004
 			}
1005 1005
 		} else {
1006 1006
 			$args['save_array'] = $this->is_readonly_array();
1007
-			$hidden             .= $this->show_single_hidden( $selected_value, $args );
1007
+			$hidden .= $this->show_single_hidden( $selected_value, $args );
1008 1008
 		}
1009 1009
 
1010 1010
 		return $hidden;
@@ -1013,7 +1013,7 @@  discard block
 block discarded – undo
1013 1013
 	protected function show_single_hidden( $selected, $args ) {
1014 1014
 		if ( $args['save_array'] ) {
1015 1015
 			$args['field_name'] .= '[]';
1016
-			$id                 = '';
1016
+			$id = '';
1017 1017
 		} else {
1018 1018
 			$id = ' id="' . esc_attr( $args['html_id'] ) . '"';
1019 1019
 		}
@@ -1029,8 +1029,8 @@  discard block
 block discarded – undo
1029 1029
 		$selected = $values['field_value'];
1030 1030
 
1031 1031
 		if ( isset( $values['combo_name'] ) ) {
1032
-			$options  = $options[ $values['combo_name'] ];
1033
-			$selected = ( is_array( $selected ) && isset( $selected[ $values['combo_name'] ] ) ) ? $selected[ $values['combo_name'] ] : '';
1032
+			$options  = $options[$values['combo_name']];
1033
+			$selected = ( is_array( $selected ) && isset( $selected[$values['combo_name']] ) ) ? $selected[$values['combo_name']] : '';
1034 1034
 		}
1035 1035
 
1036 1036
 		$input = $this->select_tag( $values );
@@ -1081,7 +1081,7 @@  discard block
 block discarded – undo
1081 1081
 	}
1082 1082
 
1083 1083
 	protected function fill_display_field_values( $args = array() ) {
1084
-		$defaults        = array(
1084
+		$defaults = array(
1085 1085
 			'field_name'    => 'item_meta[' . $this->get_field_column( 'id' ) . ']',
1086 1086
 			'field_id'      => $this->get_field_column( 'id' ),
1087 1087
 			'field_plus_id' => '',
@@ -1134,7 +1134,7 @@  discard block
 block discarded – undo
1134 1134
 			}
1135 1135
 		}
1136 1136
 
1137
-		if ( isset( $args['errors'][ 'field' . $args['field_id'] ] ) && ! $custom_error_fields ) {
1137
+		if ( isset( $args['errors']['field' . $args['field_id']] ) && ! $custom_error_fields ) {
1138 1138
 			if ( $error_comes_first ) {
1139 1139
 				array_unshift( $describedby, 'frm_error_' . $args['html_id'] );
1140 1140
 			} else {
@@ -1213,11 +1213,11 @@  discard block
 block discarded – undo
1213 1213
 
1214 1214
 		$field_id = $this->get_field_column( 'id' );
1215 1215
 		if ( ! array_key_exists( $field_id, $frm_validated_unique_values ) ) {
1216
-			$frm_validated_unique_values[ $field_id ] = array();
1216
+			$frm_validated_unique_values[$field_id] = array();
1217 1217
 			return false;
1218 1218
 		}
1219 1219
 
1220
-		$already_validated_this_value = in_array( $value, $frm_validated_unique_values[ $field_id ], true );
1220
+		$already_validated_this_value = in_array( $value, $frm_validated_unique_values[$field_id], true );
1221 1221
 		return $already_validated_this_value;
1222 1222
 	}
1223 1223
 
@@ -1242,7 +1242,7 @@  discard block
 block discarded – undo
1242 1242
 	private function value_validated_as_unique( $value ) {
1243 1243
 		global $frm_validated_unique_values;
1244 1244
 		$field_id                                   = $this->get_field_column( 'id' );
1245
-		$frm_validated_unique_values[ $field_id ][] = $value;
1245
+		$frm_validated_unique_values[$field_id][] = $value;
1246 1246
 	}
1247 1247
 
1248 1248
 	public function get_value_to_save( $value, $atts ) {
@@ -1274,8 +1274,8 @@  discard block
 block discarded – undo
1274 1274
 		$value = $this->prepare_display_value( $value, $atts );
1275 1275
 
1276 1276
 		if ( is_array( $value ) ) {
1277
-			if ( isset( $atts['show'] ) && $atts['show'] && isset( $value[ $atts['show'] ] ) ) {
1278
-				$value = $value[ $atts['show'] ];
1277
+			if ( isset( $atts['show'] ) && $atts['show'] && isset( $value[$atts['show']] ) ) {
1278
+				$value = $value[$atts['show']];
1279 1279
 			} elseif ( ! isset( $atts['return_array'] ) || ! $atts['return_array'] ) {
1280 1280
 				$sep   = isset( $atts['sep'] ) ? $atts['sep'] : ', ';
1281 1281
 				$value = implode( $sep, $value );
@@ -1344,8 +1344,8 @@  discard block
 block discarded – undo
1344 1344
 		$saved_entries = $atts['ids'];
1345 1345
 		$new_value     = array();
1346 1346
 		foreach ( (array) $value as $old_child_id ) {
1347
-			if ( isset( $saved_entries[ $old_child_id ] ) ) {
1348
-				$new_value[] = $saved_entries[ $old_child_id ];
1347
+			if ( isset( $saved_entries[$old_child_id] ) ) {
1348
+				$new_value[] = $saved_entries[$old_child_id];
1349 1349
 			}
1350 1350
 		}
1351 1351
 
Please login to merge, or discard this patch.