Completed
Pull Request — master (#1356)
by Stephanie
59s
created
classes/helpers/FrmStringReaderHelper.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 
79 79
 		while ( $count > 0 && ! is_null( $one = $this->read_one() ) ) {
80 80
 			$value .= $one;
81
-			--$count;
81
+			-- $count;
82 82
 		}
83 83
 
84 84
 		return $this->strip_quotes( $value );
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 	 */
93 93
 	private function read_one() {
94 94
 		if ( $this->pos <= $this->max ) {
95
-			$value = $this->string[ $this->pos ];
95
+			$value = $this->string[$this->pos];
96 96
 			$this->pos += 1;
97 97
 		} else {
98 98
 			$value = null;
Please login to merge, or discard this patch.
classes/helpers/FrmSerializedStringParserHelper.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -65,12 +65,12 @@
 block discarded – undo
65 65
 				$string->read( 1 );
66 66
 
67 67
 				$val = array();
68
-				for ( $i = 0; $i < $count; $i++ ) {
68
+				for ( $i = 0; $i < $count; $i ++ ) {
69 69
 					$array_key   = $this->do_parse( $string );
70 70
 					$array_value = $this->do_parse( $string );
71 71
 
72 72
 					if ( ! is_array( $array_key ) ) {
73
-						$val[ $array_key ] = $array_value;
73
+						$val[$array_key] = $array_value;
74 74
 					}
75 75
 				}
76 76
 
Please login to merge, or discard this patch.
classes/helpers/FrmOnSubmitHelper.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -240,26 +240,26 @@  discard block
 block discarded – undo
240 240
 	public static function populate_on_submit_data( &$form_options, $action = null, $event = 'create' ) {
241 241
 		$opt = 'update' === $event ? 'edit_' : 'success_';
242 242
 		if ( ! $action || ! is_object( $action ) ) {
243
-			$form_options[ $opt . 'action' ] = self::get_default_action_type();
244
-			$form_options[ $opt . 'msg' ]    = self::get_default_msg();
243
+			$form_options[$opt . 'action'] = self::get_default_action_type();
244
+			$form_options[$opt . 'msg']    = self::get_default_msg();
245 245
 
246 246
 			return;
247 247
 		}
248 248
 
249
-		$form_options[ $opt . 'action' ] = isset( $action->post_content['success_action'] ) ? $action->post_content['success_action'] : 'message';
249
+		$form_options[$opt . 'action'] = isset( $action->post_content['success_action'] ) ? $action->post_content['success_action'] : 'message';
250 250
 
251
-		switch ( $form_options[ $opt . 'action' ] ) {
251
+		switch ( $form_options[$opt . 'action'] ) {
252 252
 			case 'redirect':
253
-				$form_options[ $opt . 'url' ]    = isset( $action->post_content['success_url'] ) ? $action->post_content['success_url'] : '';
253
+				$form_options[$opt . 'url']    = isset( $action->post_content['success_url'] ) ? $action->post_content['success_url'] : '';
254 254
 				$form_options['open_in_new_tab'] = ! empty( $action->post_content['open_in_new_tab'] );
255 255
 				break;
256 256
 
257 257
 			case 'page':
258
-				$form_options[ $opt . 'page_id' ] = isset( $action->post_content['success_page_id'] ) ? $action->post_content['success_page_id'] : '';
258
+				$form_options[$opt . 'page_id'] = isset( $action->post_content['success_page_id'] ) ? $action->post_content['success_page_id'] : '';
259 259
 				break;
260 260
 
261 261
 			default:
262
-				$form_options[ $opt . 'msg' ] = ! empty( $action->post_content['success_msg'] ) ? $action->post_content['success_msg'] : self::get_default_msg();
262
+				$form_options[$opt . 'msg'] = ! empty( $action->post_content['success_msg'] ) ? $action->post_content['success_msg'] : self::get_default_msg();
263 263
 				$form_options['show_form']    = ! empty( $action->post_content['show_form'] );
264 264
 		}
265 265
 	}
@@ -348,20 +348,20 @@  discard block
 block discarded – undo
348 348
 	private static function get_on_submit_action_data_from_form_options( $form_options, $event = 'create' ) {
349 349
 		$opt  = 'update' === $event ? 'edit_' : 'success_';
350 350
 		$data = array(
351
-			'success_action' => isset( $form_options[ $opt . 'action' ] ) ? $form_options[ $opt . 'action' ] : self::get_default_action_type(),
351
+			'success_action' => isset( $form_options[$opt . 'action'] ) ? $form_options[$opt . 'action'] : self::get_default_action_type(),
352 352
 		);
353 353
 
354 354
 		switch ( $data['success_action'] ) {
355 355
 			case 'redirect':
356
-				$data['success_url'] = isset( $form_options[ $opt . 'url' ] ) ? $form_options[ $opt . 'url' ] : '';
356
+				$data['success_url'] = isset( $form_options[$opt . 'url'] ) ? $form_options[$opt . 'url'] : '';
357 357
 				break;
358 358
 
359 359
 			case 'page':
360
-				$data['success_page_id'] = isset( $form_options[ $opt . 'page_id' ] ) ? $form_options[ $opt . 'page_id' ] : '';
360
+				$data['success_page_id'] = isset( $form_options[$opt . 'page_id'] ) ? $form_options[$opt . 'page_id'] : '';
361 361
 				break;
362 362
 
363 363
 			default:
364
-				$data['success_msg'] = isset( $form_options[ $opt . 'msg' ] ) ? $form_options[ $opt . 'msg' ] : self::get_default_msg();
364
+				$data['success_msg'] = isset( $form_options[$opt . 'msg'] ) ? $form_options[$opt . 'msg'] : self::get_default_msg();
365 365
 				$data['show_form']   = ! empty( $form_options['show_form'] );
366 366
 		}
367 367
 
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
@@ -1708,7 +1708,8 @@  discard block
 block discarded – undo
1708 1708
 		$vars   = array();
1709 1709
 		FrmAppHelper::include_svg();
1710 1710
 
1711
-		if ( isset( $_POST['frm_compact_fields'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
1711
+		if ( isset( $_POST['frm_compact_fields'] ) ) {
1712
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
1712 1713
 			FrmAppHelper::permission_check( 'frm_edit_forms' );
1713 1714
 
1714 1715
 			// Javascript needs to be allowed in some field settings.
@@ -2018,7 +2019,8 @@  discard block
 block discarded – undo
2018 2019
 	private static function maybe_get_form_to_show( $id ) {
2019 2020
 		$form = false;
2020 2021
 
2021
-		if ( ! empty( $id ) ) { // form id or key is set
2022
+		if ( ! empty( $id ) ) {
2023
+// form id or key is set
2022 2024
 			$form = FrmForm::getOne( $id );
2023 2025
 			if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
2024 2026
 				$form = false;
@@ -2103,7 +2105,8 @@  discard block
 block discarded – undo
2103 2105
 	private static function get_saved_errors( $form, $params ) {
2104 2106
 		global $frm_vars;
2105 2107
 
2106
-		if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2108
+		if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) {
2109
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
2107 2110
 			$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2108 2111
 		} else {
2109 2112
 			$errors = array();
@@ -2294,7 +2297,8 @@  discard block
 block discarded – undo
2294 2297
 			$action_type = FrmOnSubmitHelper::get_action_type( $action );
2295 2298
 
2296 2299
 			if ( 'redirect' === $action_type ) {
2297
-				if ( $has_redirect ) { // Do not process because we run the first redirect action only.
2300
+				if ( $has_redirect ) {
2301
+// Do not process because we run the first redirect action only.
2298 2302
 					continue;
2299 2303
 				}
2300 2304
 			}
@@ -2523,12 +2527,14 @@  discard block
 block discarded – undo
2523 2527
 
2524 2528
 		$doing_ajax = FrmAppHelper::doing_ajax();
2525 2529
 
2526
-		if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) { // Is AJAX submit and there is just one Redirect action runs.
2530
+		if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) {
2531
+// Is AJAX submit and there is just one Redirect action runs.
2527 2532
 			echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
2528 2533
 			wp_die();
2529 2534
 		}
2530 2535
 
2531
-		if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) ) { // Not AJAX submit, no headers sent, and there is just one Redirect action runs.
2536
+		if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) ) {
2537
+// Not AJAX submit, no headers sent, and there is just one Redirect action runs.
2532 2538
 			if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
2533 2539
 				self::print_open_in_new_tab_js_with_fallback_handler( $success_url, $args );
2534 2540
 				self::$redirected_in_new_tab[ $args['form']->id ] = 1;
@@ -2628,7 +2634,8 @@  discard block
 block discarded – undo
2628 2634
 
2629 2635
 		echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2630 2636
 		echo '<script>';
2631
-		if ( empty( $args['doing_ajax'] ) ) { // Not AJAX submit, delay JS until window.load.
2637
+		if ( empty( $args['doing_ajax'] ) ) {
2638
+// Not AJAX submit, delay JS until window.load.
2632 2639
 			echo 'window.onload=function(){';
2633 2640
 		}
2634 2641
 		echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
Please login to merge, or discard this patch.
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -546,11 +546,11 @@  discard block
 block discarded – undo
546 546
 			),
547 547
 		);
548 548
 
549
-		if ( ! isset( $available_status[ $status ] ) ) {
549
+		if ( ! isset( $available_status[$status] ) ) {
550 550
 			return;
551 551
 		}
552 552
 
553
-		FrmAppHelper::permission_check( $available_status[ $status ]['permission'] );
553
+		FrmAppHelper::permission_check( $available_status[$status]['permission'] );
554 554
 
555 555
 		$params = FrmForm::list_page_params();
556 556
 
@@ -558,7 +558,7 @@  discard block
 block discarded – undo
558 558
 		check_admin_referer( $status . '_form_' . $params['id'] );
559 559
 
560 560
 		$count = 0;
561
-		if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
561
+		if ( FrmForm::set_status( $params['id'], $available_status[$status]['new_status'] ) ) {
562 562
 			$count ++;
563 563
 		}
564 564
 
@@ -575,7 +575,7 @@  discard block
 block discarded – undo
575 575
 		/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
576 576
 		$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>' );
577 577
 
578
-		$message = $available_status[ $status ]['message'];
578
+		$message = $available_status[$status]['message'];
579 579
 
580 580
 		self::display_forms_list( $params, $message );
581 581
 	}
@@ -596,7 +596,7 @@  discard block
 block discarded – undo
596 596
 				'type'  => 'request',
597 597
 			)
598 598
 		);
599
-		$message      = sprintf(
599
+		$message = sprintf(
600 600
 			/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
601 601
 			_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' ),
602 602
 			$count,
@@ -1145,7 +1145,7 @@  discard block
 block discarded – undo
1145 1145
 
1146 1146
 		foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) {
1147 1147
 			if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
1148
-				unset( $sections[ $feature ] );
1148
+				unset( $sections[$feature] );
1149 1149
 			}
1150 1150
 		}
1151 1151
 
@@ -1178,7 +1178,7 @@  discard block
 block discarded – undo
1178 1178
 				$section['id'] = $section['anchor'];
1179 1179
 			}
1180 1180
 
1181
-			$sections[ $key ] = $section;
1181
+			$sections[$key] = $section;
1182 1182
 		}
1183 1183
 
1184 1184
 		return $sections;
@@ -1296,7 +1296,7 @@  discard block
 block discarded – undo
1296 1296
 		if ( ! empty( $user_fields ) ) {
1297 1297
 			$user_helpers = array();
1298 1298
 			foreach ( $user_fields as $uk => $uf ) {
1299
-				$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1299
+				$user_helpers['|user_id| show="' . $uk . '"'] = $uf;
1300 1300
 				unset( $uk, $uf );
1301 1301
 			}
1302 1302
 
@@ -1435,7 +1435,7 @@  discard block
 block discarded – undo
1435 1435
 		if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
1436 1436
 			$frm_vars['js_validate_forms'] = array();
1437 1437
 		}
1438
-		$frm_vars['js_validate_forms'][ $form->id ] = $form;
1438
+		$frm_vars['js_validate_forms'][$form->id] = $form;
1439 1439
 	}
1440 1440
 
1441 1441
 	public static function get_email_html() {
@@ -1594,7 +1594,7 @@  discard block
 block discarded – undo
1594 1594
 				add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
1595 1595
 			} else {
1596 1596
 				$vars   = FrmAppHelper::json_to_array( $json_vars );
1597
-				$action = $vars[ $action ];
1597
+				$action = $vars[$action];
1598 1598
 				unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
1599 1599
 				$_REQUEST = array_merge( $_REQUEST, $vars ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
1600 1600
 				$_POST    = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
@@ -1753,7 +1753,7 @@  discard block
 block discarded – undo
1753 1753
 		$actions = array();
1754 1754
 		foreach ( $frm_vars['forms_loaded'] as $form ) {
1755 1755
 			if ( is_object( $form ) ) {
1756
-				$actions[ $form->id ] = $form->name;
1756
+				$actions[$form->id] = $form->name;
1757 1757
 			}
1758 1758
 			unset( $form );
1759 1759
 		}
@@ -1997,8 +1997,8 @@  discard block
 block discarded – undo
1997 1997
 	private static function get_saved_errors( $form, $params ) {
1998 1998
 		global $frm_vars;
1999 1999
 
2000
-		if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2001
-			$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2000
+		if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][$form->id] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2001
+			$errors = $frm_vars['created_entries'][$form->id]['errors'];
2002 2002
 		} else {
2003 2003
 			$errors = array();
2004 2004
 		}
@@ -2020,7 +2020,7 @@  discard block
 block discarded – undo
2020 2020
 	public static function just_created_entry( $form_id ) {
2021 2021
 		global $frm_vars;
2022 2022
 
2023
-		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;
2023
+		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;
2024 2024
 	}
2025 2025
 
2026 2026
 	/**
@@ -2040,7 +2040,7 @@  discard block
 block discarded – undo
2040 2040
 	private static function get_confirmation_method( $atts ) {
2041 2041
 		$action = FrmOnSubmitHelper::current_event( $atts );
2042 2042
 		$opt    = 'update' === $action ? 'edit_action' : 'success_action';
2043
-		$method = ( isset( $atts['form']->options[ $opt ] ) && ! empty( $atts['form']->options[ $opt ] ) ) ? $atts['form']->options[ $opt ] : 'message';
2043
+		$method = ( isset( $atts['form']->options[$opt] ) && ! empty( $atts['form']->options[$opt] ) ) ? $atts['form']->options[$opt] : 'message';
2044 2044
 
2045 2045
 		if ( ! empty( $atts['entry_id'] ) ) {
2046 2046
 			$met_actions = self::get_met_on_submit_actions( $atts, $action );
@@ -2061,7 +2061,7 @@  discard block
 block discarded – undo
2061 2061
 	public static function maybe_trigger_redirect( $form, $params, $args ) {
2062 2062
 		if ( ! isset( $params['id'] ) ) {
2063 2063
 			global $frm_vars;
2064
-			$params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id'];
2064
+			$params['id'] = $frm_vars['created_entries'][$form->id]['entry_id'];
2065 2065
 		}
2066 2066
 
2067 2067
 		$conf_method = self::get_confirmation_method(
@@ -2143,7 +2143,7 @@  discard block
 block discarded – undo
2143 2143
 		$args['success_opt'] = $opt;
2144 2144
 		$args['ajax']        = ! empty( $frm_vars['ajax'] );
2145 2145
 
2146
-		if ( $args['conf_method'] === 'page' && is_numeric( $args['form']->options[ $opt . '_page_id' ] ) ) {
2146
+		if ( $args['conf_method'] === 'page' && is_numeric( $args['form']->options[$opt . '_page_id'] ) ) {
2147 2147
 			self::load_page_after_submit( $args );
2148 2148
 		} elseif ( $args['conf_method'] === 'redirect' ) {
2149 2149
 			self::redirect_after_submit( $args );
@@ -2167,7 +2167,7 @@  discard block
 block discarded – undo
2167 2167
 		}
2168 2168
 
2169 2169
 		// If a redirect action has already opened the URL in a new tab, we show the default message in the currect tab.
2170
-		if ( ! empty( self::$redirected_in_new_tab[ $args['form']->id ] ) ) {
2170
+		if ( ! empty( self::$redirected_in_new_tab[$args['form']->id] ) ) {
2171 2171
 			return array( FrmOnSubmitHelper::get_fallback_action_after_open_in_new_tab( $event ) );
2172 2172
 		}
2173 2173
 
@@ -2354,7 +2354,7 @@  discard block
 block discarded – undo
2354 2354
 
2355 2355
 		$opt = 'update' === $args['action'] ? 'edit_' : 'success_';
2356 2356
 
2357
-		$new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ];
2357
+		$new_args['conf_method'] = $new_args['form']->options[$opt . 'action'];
2358 2358
 
2359 2359
 		/**
2360 2360
 		 * Filters the run success action args.
@@ -2374,8 +2374,8 @@  discard block
 block discarded – undo
2374 2374
 	private static function load_page_after_submit( $args ) {
2375 2375
 		global $post;
2376 2376
 		$opt = $args['success_opt'];
2377
-		if ( ! $post || $args['form']->options[ $opt . '_page_id' ] != $post->ID ) {
2378
-			$page     = get_post( $args['form']->options[ $opt . '_page_id' ] );
2377
+		if ( ! $post || $args['form']->options[$opt . '_page_id'] != $post->ID ) {
2378
+			$page     = get_post( $args['form']->options[$opt . '_page_id'] );
2379 2379
 			$old_post = $post;
2380 2380
 			$post     = $page;
2381 2381
 			$content  = apply_filters( 'frm_content', $page->post_content, $args['form'], $args['entry_id'] );
@@ -2405,7 +2405,7 @@  discard block
 block discarded – undo
2405 2405
 		add_filter( 'frm_use_wpautop', '__return_false' );
2406 2406
 
2407 2407
 		$opt         = $args['success_opt'];
2408
-		$success_url = trim( $args['form']->options[ $opt . '_url' ] );
2408
+		$success_url = trim( $args['form']->options[$opt . '_url'] );
2409 2409
 		$success_url = apply_filters( 'frm_content', $success_url, $args['form'], $args['entry_id'] );
2410 2410
 		$success_url = do_shortcode( $success_url );
2411 2411
 
@@ -2425,7 +2425,7 @@  discard block
 block discarded – undo
2425 2425
 		if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) ) { // Not AJAX submit, no headers sent, and there is just one Redirect action runs.
2426 2426
 			if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
2427 2427
 				self::print_open_in_new_tab_js_with_fallback_handler( $success_url, $args );
2428
-				self::$redirected_in_new_tab[ $args['form']->id ] = 1;
2428
+				self::$redirected_in_new_tab[$args['form']->id] = 1;
2429 2429
 				return;
2430 2430
 			}
2431 2431
 
@@ -2685,7 +2685,7 @@  discard block
 block discarded – undo
2685 2685
 			'description' => false,
2686 2686
 			'reset'       => false,
2687 2687
 		);
2688
-		$args     = wp_parse_args( $args, $defaults );
2688
+		$args = wp_parse_args( $args, $defaults );
2689 2689
 	}
2690 2690
 
2691 2691
 	/**
@@ -2723,7 +2723,7 @@  discard block
 block discarded – undo
2723 2723
 		$opt          = isset( $args['success_opt'] ) ? $args['success_opt'] : 'success';
2724 2724
 
2725 2725
 		if ( $entry_id && is_numeric( $entry_id ) ) {
2726
-			$message = isset( $form->options[ $opt . '_msg' ] ) ? $form->options[ $opt . '_msg' ] : $frm_settings->success_msg;
2726
+			$message = isset( $form->options[$opt . '_msg'] ) ? $form->options[$opt . '_msg'] : $frm_settings->success_msg;
2727 2727
 			$class   = 'frm_message';
2728 2728
 		} else {
2729 2729
 			$message = $frm_settings->failed_msg;
@@ -2947,7 +2947,7 @@  discard block
 block discarded – undo
2947 2947
 
2948 2948
 		check_ajax_referer( 'frm_ajax', 'nonce' );
2949 2949
 
2950
-		$html             = FrmAppHelper::clip(
2950
+		$html = FrmAppHelper::clip(
2951 2951
 			function() {
2952 2952
 				FrmAppHelper::maybe_autocomplete_pages_options(
2953 2953
 					array(
Please login to merge, or discard this patch.
classes/controllers/FrmSimpleBlocksController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@
 block discarded – undo
76 76
 			return false;
77 77
 		}
78 78
 
79
-		return $addons[ $addon_id ];
79
+		return $addons[$addon_id];
80 80
 	}
81 81
 
82 82
 	/**
Please login to merge, or discard this patch.
classes/factories/FrmFieldFactory.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -108,7 +108,7 @@
 block discarded – undo
108 108
 			'credit_card' => 'FrmFieldCreditCard',
109 109
 		);
110 110
 
111
-		$class = isset( $type_classes[ $field_type ] ) ? $type_classes[ $field_type ] : '';
111
+		$class = isset( $type_classes[$field_type] ) ? $type_classes[$field_type] : '';
112 112
 
113 113
 		return apply_filters( 'frm_get_field_type_class', $class, $field_type );
114 114
 	}
Please login to merge, or discard this patch.
classes/models/FrmField.php 1 patch
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
272 272
 		$values = FrmAppHelper::maybe_filter_array( $values, array( 'name', 'description' ) );
273 273
 
274 274
 		foreach ( array( 'name', 'description', 'type', 'default_value' ) as $col ) {
275
-			$new_values[ $col ] = $values[ $col ];
275
+			$new_values[$col] = $values[$col];
276 276
 		}
277 277
 
278 278
 		$new_values['options']       = self::maybe_filter_options( $values['options'] );
@@ -283,7 +283,7 @@  discard block
 block discarded – undo
283 283
 		$new_values['created_at']    = current_time( 'mysql', 1 );
284 284
 
285 285
 		if ( isset( $values['id'] ) ) {
286
-			$frm_duplicate_ids[ $values['field_key'] ] = $new_values['field_key'];
286
+			$frm_duplicate_ids[$values['field_key']] = $new_values['field_key'];
287 287
 			$new_values                                = apply_filters( 'frm_duplicated_field', $new_values );
288 288
 		}
289 289
 
@@ -292,9 +292,9 @@  discard block
 block discarded – undo
292 292
 		foreach ( $new_values as $k => $v ) {
293 293
 			if ( is_array( $v ) ) {
294 294
 				if ( $k === 'default_value' ) {
295
-					$new_values[ $k ] = FrmAppHelper::maybe_json_encode( $v );
295
+					$new_values[$k] = FrmAppHelper::maybe_json_encode( $v );
296 296
 				} else {
297
-					$new_values[ $k ] = serialize( $v );
297
+					$new_values[$k] = serialize( $v );
298 298
 				}
299 299
 			}
300 300
 			unset( $k, $v );
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
314 314
 		}
315 315
 
316 316
 		if ( isset( $values['id'] ) ) {
317
-			$frm_duplicate_ids[ $values['id'] ] = $new_id;
317
+			$frm_duplicate_ids[$values['id']] = $new_id;
318 318
 		}
319 319
 
320 320
 		return $new_id;
@@ -374,7 +374,7 @@  discard block
 block discarded – undo
374 374
 	public static function duplicate( $old_form_id, $form_id, $copy_keys = false, $blog_id = false ) {
375 375
 		global $frm_duplicate_ids;
376 376
 
377
-		$where  = array(
377
+		$where = array(
378 378
 			array(
379 379
 				'or'                => 1,
380 380
 				'fi.form_id'        => $old_form_id,
@@ -420,8 +420,8 @@  discard block
 block discarded – undo
420 420
 
421 421
 			$values                                 = apply_filters( 'frm_duplicated_field', $values );
422 422
 			$new_id                                 = self::create( $values );
423
-			$frm_duplicate_ids[ $field->id ]        = $new_id;
424
-			$frm_duplicate_ids[ $field->field_key ] = $new_id;
423
+			$frm_duplicate_ids[$field->id]        = $new_id;
424
+			$frm_duplicate_ids[$field->field_key] = $new_id;
425 425
 			unset( $field );
426 426
 		}
427 427
 	}
@@ -453,11 +453,11 @@  discard block
 block discarded – undo
453 453
 
454 454
 		// serialize array values
455 455
 		foreach ( array( 'field_options', 'options' ) as $opt ) {
456
-			if ( isset( $values[ $opt ] ) && is_array( $values[ $opt ] ) ) {
456
+			if ( isset( $values[$opt] ) && is_array( $values[$opt] ) ) {
457 457
 				if ( 'field_options' === $opt ) {
458
-					$values[ $opt ] = self::maybe_filter_options( $values[ $opt ] );
458
+					$values[$opt] = self::maybe_filter_options( $values[$opt] );
459 459
 				}
460
-				$values[ $opt ] = serialize( $values[ $opt ] );
460
+				$values[$opt] = serialize( $values[$opt] );
461 461
 			}
462 462
 		}
463 463
 		if ( isset( $values['default_value'] ) && is_array( $values['default_value'] ) ) {
@@ -609,7 +609,7 @@  discard block
 block discarded – undo
609 609
 				'id'        => $id,
610 610
 				'field_key' => $id,
611 611
 			);
612
-			$type  = FrmDb::get_var( 'frm_fields', $where, $col );
612
+			$type = FrmDb::get_var( 'frm_fields', $where, $col );
613 613
 		}
614 614
 
615 615
 		return $type;
@@ -635,7 +635,7 @@  discard block
 block discarded – undo
635 635
 					continue;
636 636
 				}
637 637
 
638
-				$fields[ $result->id ] = $result;
638
+				$fields[$result->id] = $result;
639 639
 				$count ++;
640 640
 				if ( $limit == 1 ) {
641 641
 					$fields = $result;
@@ -681,7 +681,7 @@  discard block
 block discarded – undo
681 681
 			$count  = 0;
682 682
 			foreach ( $results as $result ) {
683 683
 				$count ++;
684
-				$fields[ $result->id ] = $result;
684
+				$fields[$result->id] = $result;
685 685
 				if ( ! empty( $limit ) && $count >= $limit ) {
686 686
 					break;
687 687
 				}
@@ -750,7 +750,7 @@  discard block
 block discarded – undo
750 750
 			}
751 751
 
752 752
 			if ( ! empty( $sub_fields ) ) {
753
-				$index        = $k + $index_offset;
753
+				$index = $k + $index_offset;
754 754
 				$index_offset += count( $sub_fields );
755 755
 				array_splice( $results, $index, 0, $sub_fields );
756 756
 			}
@@ -795,7 +795,7 @@  discard block
 block discarded – undo
795 795
 		$query_type = ( $limit == ' LIMIT 1' || $limit == 1 ) ? 'row' : 'results';
796 796
 
797 797
 		if ( is_array( $where ) ) {
798
-			$args    = array(
798
+			$args = array(
799 799
 				'order_by' => $order_by,
800 800
 				'limit'    => $limit,
801 801
 			);
@@ -826,9 +826,9 @@  discard block
 block discarded – undo
826 826
 				FrmDb::set_cache( $result->field_key, $result, 'frm_field' );
827 827
 
828 828
 				self::prepare_options( $result );
829
-				$results[ $r_key ]->field_options = $result->field_options;
830
-				$results[ $r_key ]->options       = $result->options;
831
-				$results[ $r_key ]->default_value = $result->default_value;
829
+				$results[$r_key]->field_options = $result->field_options;
830
+				$results[$r_key]->options       = $result->options;
831
+				$results[$r_key]->default_value = $result->default_value;
832 832
 
833 833
 				unset( $r_key, $result );
834 834
 			}
@@ -1030,23 +1030,23 @@  discard block
 block discarded – undo
1030 1030
 	}
1031 1031
 
1032 1032
 	public static function is_option_true_in_array( $field, $option ) {
1033
-		return isset( $field[ $option ] ) && $field[ $option ];
1033
+		return isset( $field[$option] ) && $field[$option];
1034 1034
 	}
1035 1035
 
1036 1036
 	public static function is_option_true_in_object( $field, $option ) {
1037
-		return isset( $field->field_options[ $option ] ) && $field->field_options[ $option ];
1037
+		return isset( $field->field_options[$option] ) && $field->field_options[$option];
1038 1038
 	}
1039 1039
 
1040 1040
 	public static function is_option_empty_in_array( $field, $option ) {
1041
-		return ! isset( $field[ $option ] ) || empty( $field[ $option ] );
1041
+		return ! isset( $field[$option] ) || empty( $field[$option] );
1042 1042
 	}
1043 1043
 
1044 1044
 	public static function is_option_empty_in_object( $field, $option ) {
1045
-		return ! isset( $field->field_options[ $option ] ) || empty( $field->field_options[ $option ] );
1045
+		return ! isset( $field->field_options[$option] ) || empty( $field->field_options[$option] );
1046 1046
 	}
1047 1047
 
1048 1048
 	public static function is_option_value_in_object( $field, $option ) {
1049
-		return isset( $field->field_options[ $option ] ) && $field->field_options[ $option ] != '';
1049
+		return isset( $field->field_options[$option] ) && $field->field_options[$option] != '';
1050 1050
 	}
1051 1051
 
1052 1052
 	/**
@@ -1064,10 +1064,10 @@  discard block
 block discarded – undo
1064 1064
 
1065 1065
 	public static function get_option_in_array( $field, $option ) {
1066 1066
 
1067
-		if ( isset( $field[ $option ] ) ) {
1068
-			$this_option = $field[ $option ];
1069
-		} elseif ( isset( $field['field_options'] ) && is_array( $field['field_options'] ) && isset( $field['field_options'][ $option ] ) ) {
1070
-			$this_option = $field['field_options'][ $option ];
1067
+		if ( isset( $field[$option] ) ) {
1068
+			$this_option = $field[$option];
1069
+		} elseif ( isset( $field['field_options'] ) && is_array( $field['field_options'] ) && isset( $field['field_options'][$option] ) ) {
1070
+			$this_option = $field['field_options'][$option];
1071 1071
 		} else {
1072 1072
 			$this_option = '';
1073 1073
 		}
@@ -1076,7 +1076,7 @@  discard block
 block discarded – undo
1076 1076
 	}
1077 1077
 
1078 1078
 	public static function get_option_in_object( $field, $option ) {
1079
-		return isset( $field->field_options[ $option ] ) ? $field->field_options[ $option ] : '';
1079
+		return isset( $field->field_options[$option] ) ? $field->field_options[$option] : '';
1080 1080
 	}
1081 1081
 
1082 1082
 	/**
Please login to merge, or discard this patch.
classes/models/FrmFormAction.php 1 patch
Spacing   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -5,15 +5,15 @@  discard block
 block discarded – undo
5 5
 
6 6
 class FrmFormAction {
7 7
 
8
-	public $id_base;         // Root id for all actions of this type.
9
-	public $name;            // Name for this action type.
8
+	public $id_base; // Root id for all actions of this type.
9
+	public $name; // Name for this action type.
10 10
 	public $option_name;
11
-	public $action_options;  // Option array passed to wp_register_sidebar_widget()
11
+	public $action_options; // Option array passed to wp_register_sidebar_widget()
12 12
 	public $control_options; // Option array passed to wp_register_widget_control()
13 13
 
14
-	public $form_id;         // The ID of the form to evaluate
15
-	public $number = false;  // Unique ID number of the current instance.
16
-	public $id = '';         // Unique ID string of the current instance (id_base-number)
14
+	public $form_id; // The ID of the form to evaluate
15
+	public $number = false; // Unique ID number of the current instance.
16
+	public $id = ''; // Unique ID string of the current instance (id_base-number)
17 17
 	public $updated = false; // Set true when we update the data after a POST submit - makes sure we don't do it twice.
18 18
 
19 19
 	// Member functions that you must over-ride.
@@ -156,9 +156,9 @@  discard block
 block discarded – undo
156 156
 		$groups = FrmFormActionsController::form_action_groups();
157 157
 		$group  = 'misc';
158 158
 
159
-		if ( isset( $action_options['group'] ) && isset( $groups[ $action_options['group'] ] ) ) {
159
+		if ( isset( $action_options['group'] ) && isset( $groups[$action_options['group']] ) ) {
160 160
 			$group = $action_options['group'];
161
-		} elseif ( isset( $groups[ $this->id_base ] ) ) {
161
+		} elseif ( isset( $groups[$this->id_base] ) ) {
162 162
 			$group = $this->id_base;
163 163
 		} else {
164 164
 			foreach ( $groups as $name => $check_group ) {
@@ -169,8 +169,8 @@  discard block
 block discarded – undo
169 169
 			}
170 170
 		}
171 171
 
172
-		$groups[ $group ]['id'] = $group;
173
-		return $groups[ $group ];
172
+		$groups[$group]['id'] = $group;
173
+		return $groups[$group];
174 174
 	}
175 175
 
176 176
 	/**
@@ -280,7 +280,7 @@  discard block
 block discarded – undo
280 280
 	 * @return integer $post_id
281 281
 	 */
282 282
 	public function maybe_create_action( $action, $forms ) {
283
-		if ( isset( $action['ID'] ) && is_numeric( $action['ID'] ) && isset( $forms[ $action['menu_order'] ] ) && $forms[ $action['menu_order'] ] == 'updated' ) {
283
+		if ( isset( $action['ID'] ) && is_numeric( $action['ID'] ) && isset( $forms[$action['menu_order']] ) && $forms[$action['menu_order']] == 'updated' ) {
284 284
 			// Update action only
285 285
 			$action['post_content'] = FrmAppHelper::maybe_json_decode( $action['post_content'] );
286 286
 			$post_id                = $this->save_settings( $action );
@@ -303,18 +303,18 @@  discard block
 block discarded – undo
303 303
 		$switch             = $this->get_global_switch_fields();
304 304
 
305 305
 		foreach ( (array) $action->post_content as $key => $val ) {
306
-			if ( is_numeric( $val ) && isset( $frm_duplicate_ids[ $val ] ) ) {
307
-				$action->post_content[ $key ] = $frm_duplicate_ids[ $val ];
306
+			if ( is_numeric( $val ) && isset( $frm_duplicate_ids[$val] ) ) {
307
+				$action->post_content[$key] = $frm_duplicate_ids[$val];
308 308
 			} elseif ( ! is_array( $val ) ) {
309
-				$action->post_content[ $key ] = FrmFieldsHelper::switch_field_ids( $val );
310
-			} elseif ( isset( $switch[ $key ] ) && is_array( $switch[ $key ] ) ) {
309
+				$action->post_content[$key] = FrmFieldsHelper::switch_field_ids( $val );
310
+			} elseif ( isset( $switch[$key] ) && is_array( $switch[$key] ) ) {
311 311
 				// loop through each value if empty
312
-				if ( empty( $switch[ $key ] ) ) {
313
-					$switch[ $key ] = array_keys( $val );
312
+				if ( empty( $switch[$key] ) ) {
313
+					$switch[$key] = array_keys( $val );
314 314
 				}
315 315
 
316
-				foreach ( $switch[ $key ] as $subkey ) {
317
-					$action->post_content[ $key ] = $this->duplicate_array_walk( $action->post_content[ $key ], $subkey, $val );
316
+				foreach ( $switch[$key] as $subkey ) {
317
+					$action->post_content[$key] = $this->duplicate_array_walk( $action->post_content[$key], $subkey, $val );
318 318
 				}
319 319
 			}
320 320
 
@@ -332,20 +332,20 @@  discard block
 block discarded – undo
332 332
 			foreach ( $subkey as $subkey2 ) {
333 333
 				foreach ( (array) $val as $ck => $cv ) {
334 334
 					if ( is_array( $cv ) ) {
335
-						$action[ $ck ] = $this->duplicate_array_walk( $action[ $ck ], $subkey2, $cv );
336
-					} elseif ( isset( $cv[ $subkey ] ) && is_numeric( $cv[ $subkey ] ) && isset( $frm_duplicate_ids[ $cv[ $subkey ] ] ) ) {
337
-						$action[ $ck ][ $subkey ] = $frm_duplicate_ids[ $cv[ $subkey ] ];
335
+						$action[$ck] = $this->duplicate_array_walk( $action[$ck], $subkey2, $cv );
336
+					} elseif ( isset( $cv[$subkey] ) && is_numeric( $cv[$subkey] ) && isset( $frm_duplicate_ids[$cv[$subkey]] ) ) {
337
+						$action[$ck][$subkey] = $frm_duplicate_ids[$cv[$subkey]];
338 338
 					}
339 339
 				}
340 340
 			}
341 341
 		} else {
342 342
 			foreach ( (array) $val as $ck => $cv ) {
343 343
 				if ( is_array( $cv ) ) {
344
-					$action[ $ck ] = $this->duplicate_array_walk( $action[ $ck ], $subkey, $cv );
345
-				} elseif ( $ck == $subkey && isset( $frm_duplicate_ids[ $cv ] ) ) {
346
-					$action[ $ck ] = $frm_duplicate_ids[ $cv ];
344
+					$action[$ck] = $this->duplicate_array_walk( $action[$ck], $subkey, $cv );
345
+				} elseif ( $ck == $subkey && isset( $frm_duplicate_ids[$cv] ) ) {
346
+					$action[$ck] = $frm_duplicate_ids[$cv];
347 347
 				} elseif ( $ck == $subkey ) {
348
-					$action[ $ck ] = $this->maybe_switch_field_ids( $action[ $ck ] );
348
+					$action[$ck] = $this->maybe_switch_field_ids( $action[$ck] );
349 349
 				}
350 350
 			}
351 351
 		}
@@ -369,10 +369,10 @@  discard block
 block discarded – undo
369 369
 		}
370 370
 
371 371
 		// phpcs:ignore WordPress.Security.NonceVerification.Missing
372
-		if ( isset( $_POST[ $this->option_name ] ) && is_array( $_POST[ $this->option_name ] ) ) {
372
+		if ( isset( $_POST[$this->option_name] ) && is_array( $_POST[$this->option_name] ) ) {
373 373
 			// Sanitizing removes scripts and <email> type of values.
374 374
 			// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
375
-			$settings = wp_unslash( $_POST[ $this->option_name ] );
375
+			$settings = wp_unslash( $_POST[$this->option_name] );
376 376
 		} else {
377 377
 			return;
378 378
 		}
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
 		foreach ( $settings as $number => $new_instance ) {
383 383
 			$this->_set( $number );
384 384
 
385
-			$old_instance = isset( $all_instances[ $number ] ) ? $all_instances[ $number ] : array();
385
+			$old_instance = isset( $all_instances[$number] ) ? $all_instances[$number] : array();
386 386
 
387 387
 			if ( ! isset( $new_instance['post_status'] ) ) {
388 388
 				$new_instance['post_status'] = 'draft';
@@ -421,7 +421,7 @@  discard block
 block discarded – undo
421 421
 			$instance['post_content'] = apply_filters( 'frm_before_save_' . $this->id_base . '_action', $instance['post_content'], $instance, $new_instance, $old_instance, $this );
422 422
 
423 423
 			if ( false !== $instance ) {
424
-				$all_instances[ $number ] = $instance;
424
+				$all_instances[$number] = $instance;
425 425
 			}
426 426
 
427 427
 			$action_ids[] = $this->save_settings( $instance );
@@ -503,12 +503,12 @@  discard block
 block discarded – undo
503 503
 			// some plugins/themes are formatting the post_excerpt
504 504
 			$action->post_excerpt = sanitize_title( $action->post_excerpt );
505 505
 
506
-			if ( ! isset( $action_controls[ $action->post_excerpt ] ) ) {
506
+			if ( ! isset( $action_controls[$action->post_excerpt] ) ) {
507 507
 				continue;
508 508
 			}
509 509
 
510
-			$action                  = $action_controls[ $action->post_excerpt ]->prepare_action( $action );
511
-			$settings[ $action->ID ] = $action;
510
+			$action                  = $action_controls[$action->post_excerpt]->prepare_action( $action );
511
+			$settings[$action->ID] = $action;
512 512
 
513 513
 			if ( count( $settings ) >= $limit ) {
514 514
 				break;
@@ -541,7 +541,7 @@  discard block
 block discarded – undo
541 541
 			'limit'       => 99,
542 542
 			'post_status' => $default_status,
543 543
 		);
544
-		$args     = wp_parse_args( $args, $defaults );
544
+		$args = wp_parse_args( $args, $defaults );
545 545
 	}
546 546
 
547 547
 	/**
@@ -607,7 +607,7 @@  discard block
 block discarded – undo
607 607
 
608 608
 			$action = $this->prepare_action( $action );
609 609
 
610
-			$settings[ $action->ID ] = $action;
610
+			$settings[$action->ID] = $action;
611 611
 		}
612 612
 
613 613
 		if ( 1 === $limit ) {
@@ -650,10 +650,10 @@  discard block
 block discarded – undo
650 650
 
651 651
 		foreach ( $default_values as $k => $vals ) {
652 652
 			if ( is_array( $vals ) && ! empty( $vals ) ) {
653
-				if ( 'event' === $k && ! $this->action_options['force_event'] && ! empty( $action->post_content[ $k ] ) ) {
653
+				if ( 'event' === $k && ! $this->action_options['force_event'] && ! empty( $action->post_content[$k] ) ) {
654 654
 					continue;
655 655
 				}
656
-				$action->post_content[ $k ] = wp_parse_args( $action->post_content[ $k ], $vals );
656
+				$action->post_content[$k] = wp_parse_args( $action->post_content[$k], $vals );
657 657
 			}
658 658
 		}
659 659
 
@@ -736,14 +736,14 @@  discard block
 block discarded – undo
736 736
 	 * Migrate settings from form->options into new action.
737 737
 	 */
738 738
 	public function migrate_to_2( $form, $update = 'update' ) {
739
-		$action        = $this->prepare_new( $form->id );
739
+		$action = $this->prepare_new( $form->id );
740 740
 		FrmAppHelper::unserialize_or_decode( $form->options );
741 741
 
742 742
 		// fill with existing options
743 743
 		foreach ( $action->post_content as $name => $val ) {
744
-			if ( isset( $form->options[ $name ] ) ) {
745
-				$action->post_content[ $name ] = $form->options[ $name ];
746
-				unset( $form->options[ $name ] );
744
+			if ( isset( $form->options[$name] ) ) {
745
+				$action->post_content[$name] = $form->options[$name];
746
+				unset( $form->options[$name] );
747 747
 			}
748 748
 		}
749 749
 
@@ -809,7 +809,7 @@  discard block
 block discarded – undo
809 809
 				$stop = $stop ? false : true;
810 810
 			}
811 811
 
812
-			$met[ $stop ] = $stop;
812
+			$met[$stop] = $stop;
813 813
 		}
814 814
 
815 815
 		if ( $notification['conditions']['any_all'] == 'all' && ! empty( $met ) && isset( $met[0] ) && isset( $met[1] ) ) {
@@ -863,8 +863,8 @@  discard block
 block discarded – undo
863 863
 	private static function get_value_from_entry( $entry, $field_id ) {
864 864
 		$observed_value = '';
865 865
 
866
-		if ( isset( $entry->metas[ $field_id ] ) ) {
867
-			$observed_value = $entry->metas[ $field_id ];
866
+		if ( isset( $entry->metas[$field_id] ) ) {
867
+			$observed_value = $entry->metas[$field_id];
868 868
 		} elseif ( $entry->post_id && FrmAppHelper::pro_is_installed() ) {
869 869
 			$field          = FrmField::getOne( $field_id );
870 870
 			$observed_value = FrmProEntryMetaHelper::get_post_or_meta_value(
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
@@ -144,8 +144,8 @@  discard block
 block discarded – undo
144 144
 		$field_val = '';
145 145
 		if ( is_object( $this->field ) ) {
146 146
 			$field_val = $this->field->{$column};
147
-		} elseif ( is_array( $this->field ) && isset( $this->field[ $column ] ) ) {
148
-			$field_val = $this->field[ $column ];
147
+		} elseif ( is_array( $this->field ) && isset( $this->field[$column] ) ) {
148
+			$field_val = $this->field[$column];
149 149
 		}
150 150
 
151 151
 		return $field_val;
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
 		if ( is_object( $this->field ) ) {
160 160
 			$this->field->{$column} = $value;
161 161
 		} elseif ( is_array( $this->field ) ) {
162
-			$this->field[ $column ] = $value;
162
+			$this->field[$column] = $value;
163 163
 		}
164 164
 	}
165 165
 
@@ -548,7 +548,7 @@  discard block
 block discarded – undo
548 548
 			printf(
549 549
 				/* translators: %s: Field type */
550 550
 				esc_html__( '%s Options', 'formidable' ),
551
-				esc_html( $all_field_types[ $args['display']['type'] ]['name'] )
551
+				esc_html( $all_field_types[$args['display']['type']]['name'] )
552 552
 			);
553 553
 			FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown6_icon', array( 'aria-hidden' => 'true' ) );
554 554
 			?>
@@ -681,8 +681,8 @@  discard block
 block discarded – undo
681 681
 
682 682
 		$fields = array_merge( $fields, $pro_fields );
683 683
 
684
-		if ( isset( $fields[ $this->type ] ) ) {
685
-			$name = is_array( $fields[ $this->type ] ) ? $fields[ $this->type ]['name'] : $fields[ $this->type ];
684
+		if ( isset( $fields[$this->type] ) ) {
685
+			$name = is_array( $fields[$this->type] ) ? $fields[$this->type]['name'] : $fields[$this->type];
686 686
 		}
687 687
 
688 688
 		return $name;
@@ -699,7 +699,7 @@  discard block
 block discarded – undo
699 699
 	 * @return array
700 700
 	 */
701 701
 	public function get_default_field_options() {
702
-		$opts       = array(
702
+		$opts = array(
703 703
 			'size'               => '',
704 704
 			'max'                => '',
705 705
 			'label'              => '',
@@ -1066,7 +1066,7 @@  discard block
 block discarded – undo
1066 1066
 			}
1067 1067
 		} else {
1068 1068
 			$args['save_array'] = $this->is_readonly_array();
1069
-			$hidden             .= $this->show_single_hidden( $selected_value, $args );
1069
+			$hidden .= $this->show_single_hidden( $selected_value, $args );
1070 1070
 		}
1071 1071
 
1072 1072
 		return $hidden;
@@ -1075,7 +1075,7 @@  discard block
 block discarded – undo
1075 1075
 	protected function show_single_hidden( $selected, $args ) {
1076 1076
 		if ( $args['save_array'] ) {
1077 1077
 			$args['field_name'] .= '[]';
1078
-			$id                 = '';
1078
+			$id = '';
1079 1079
 		} else {
1080 1080
 			$id = ' id="' . esc_attr( $args['html_id'] ) . '"';
1081 1081
 		}
@@ -1091,8 +1091,8 @@  discard block
 block discarded – undo
1091 1091
 		$selected = $values['field_value'];
1092 1092
 
1093 1093
 		if ( isset( $values['combo_name'] ) ) {
1094
-			$options  = $options[ $values['combo_name'] ];
1095
-			$selected = ( is_array( $selected ) && isset( $selected[ $values['combo_name'] ] ) ) ? $selected[ $values['combo_name'] ] : '';
1094
+			$options  = $options[$values['combo_name']];
1095
+			$selected = ( is_array( $selected ) && isset( $selected[$values['combo_name']] ) ) ? $selected[$values['combo_name']] : '';
1096 1096
 		}
1097 1097
 
1098 1098
 		$input = $this->select_tag( $values );
@@ -1143,7 +1143,7 @@  discard block
 block discarded – undo
1143 1143
 	}
1144 1144
 
1145 1145
 	protected function fill_display_field_values( $args = array() ) {
1146
-		$defaults        = array(
1146
+		$defaults = array(
1147 1147
 			'field_name'    => 'item_meta[' . $this->get_field_column( 'id' ) . ']',
1148 1148
 			'field_id'      => $this->get_field_column( 'id' ),
1149 1149
 			'field_plus_id' => '',
@@ -1196,7 +1196,7 @@  discard block
 block discarded – undo
1196 1196
 			}
1197 1197
 		}
1198 1198
 
1199
-		if ( isset( $args['errors'][ 'field' . $args['field_id'] ] ) && ! $custom_error_fields ) {
1199
+		if ( isset( $args['errors']['field' . $args['field_id']] ) && ! $custom_error_fields ) {
1200 1200
 			if ( $error_comes_first ) {
1201 1201
 				array_unshift( $describedby, 'frm_error_' . $args['html_id'] );
1202 1202
 			} else {
@@ -1275,11 +1275,11 @@  discard block
 block discarded – undo
1275 1275
 
1276 1276
 		$field_id = $this->get_field_column( 'id' );
1277 1277
 		if ( ! array_key_exists( $field_id, $frm_validated_unique_values ) ) {
1278
-			$frm_validated_unique_values[ $field_id ] = array();
1278
+			$frm_validated_unique_values[$field_id] = array();
1279 1279
 			return false;
1280 1280
 		}
1281 1281
 
1282
-		$already_validated_this_value = in_array( $value, $frm_validated_unique_values[ $field_id ], true );
1282
+		$already_validated_this_value = in_array( $value, $frm_validated_unique_values[$field_id], true );
1283 1283
 		return $already_validated_this_value;
1284 1284
 	}
1285 1285
 
@@ -1304,7 +1304,7 @@  discard block
 block discarded – undo
1304 1304
 	private function value_validated_as_unique( $value ) {
1305 1305
 		global $frm_validated_unique_values;
1306 1306
 		$field_id                                   = $this->get_field_column( 'id' );
1307
-		$frm_validated_unique_values[ $field_id ][] = $value;
1307
+		$frm_validated_unique_values[$field_id][] = $value;
1308 1308
 	}
1309 1309
 
1310 1310
 	public function get_value_to_save( $value, $atts ) {
@@ -1336,8 +1336,8 @@  discard block
 block discarded – undo
1336 1336
 		$value = $this->prepare_display_value( $value, $atts );
1337 1337
 
1338 1338
 		if ( is_array( $value ) ) {
1339
-			if ( isset( $atts['show'] ) && $atts['show'] && isset( $value[ $atts['show'] ] ) ) {
1340
-				$value = $value[ $atts['show'] ];
1339
+			if ( isset( $atts['show'] ) && $atts['show'] && isset( $value[$atts['show']] ) ) {
1340
+				$value = $value[$atts['show']];
1341 1341
 			} elseif ( ! isset( $atts['return_array'] ) || ! $atts['return_array'] ) {
1342 1342
 				$sep   = isset( $atts['sep'] ) ? $atts['sep'] : ', ';
1343 1343
 				$value = implode( $sep, $value );
@@ -1406,8 +1406,8 @@  discard block
 block discarded – undo
1406 1406
 		$saved_entries = $atts['ids'];
1407 1407
 		$new_value     = array();
1408 1408
 		foreach ( (array) $value as $old_child_id ) {
1409
-			if ( isset( $saved_entries[ $old_child_id ] ) ) {
1410
-				$new_value[] = $saved_entries[ $old_child_id ];
1409
+			if ( isset( $saved_entries[$old_child_id] ) ) {
1410
+				$new_value[] = $saved_entries[$old_child_id];
1411 1411
 			}
1412 1412
 		}
1413 1413
 
Please login to merge, or discard this patch.