Completed
Pull Request — master (#1278)
by Stephanie
35s
created
classes/controllers/FrmFormsController.php 1 patch
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -530,11 +530,11 @@  discard block
 block discarded – undo
530 530
 			),
531 531
 		);
532 532
 
533
-		if ( ! isset( $available_status[ $status ] ) ) {
533
+		if ( ! isset( $available_status[$status] ) ) {
534 534
 			return;
535 535
 		}
536 536
 
537
-		FrmAppHelper::permission_check( $available_status[ $status ]['permission'] );
537
+		FrmAppHelper::permission_check( $available_status[$status]['permission'] );
538 538
 
539 539
 		$params = FrmForm::list_page_params();
540 540
 
@@ -542,7 +542,7 @@  discard block
 block discarded – undo
542 542
 		check_admin_referer( $status . '_form_' . $params['id'] );
543 543
 
544 544
 		$count = 0;
545
-		if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
545
+		if ( FrmForm::set_status( $params['id'], $available_status[$status]['new_status'] ) ) {
546 546
 			$count ++;
547 547
 		}
548 548
 
@@ -559,7 +559,7 @@  discard block
 block discarded – undo
559 559
 		/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
560 560
 		$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>' );
561 561
 
562
-		$message = $available_status[ $status ]['message'];
562
+		$message = $available_status[$status]['message'];
563 563
 
564 564
 		self::display_forms_list( $params, $message );
565 565
 	}
@@ -580,7 +580,7 @@  discard block
 block discarded – undo
580 580
 				'type'  => 'request',
581 581
 			)
582 582
 		);
583
-		$message      = sprintf(
583
+		$message = sprintf(
584 584
 			/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
585 585
 			_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' ),
586 586
 			$count,
@@ -1004,11 +1004,11 @@  discard block
 block discarded – undo
1004 1004
 			}
1005 1005
 
1006 1006
 			foreach ( $template['categories'] as $category ) {
1007
-				if ( ! isset( $templates_by_category[ $category ] ) ) {
1008
-					$templates_by_category[ $category ] = array();
1007
+				if ( ! isset( $templates_by_category[$category] ) ) {
1008
+					$templates_by_category[$category] = array();
1009 1009
 				}
1010 1010
 
1011
-				$templates_by_category[ $category ][] = $template;
1011
+				$templates_by_category[$category][] = $template;
1012 1012
 			}
1013 1013
 		}
1014 1014
 		unset( $template );
@@ -1037,7 +1037,7 @@  discard block
 block discarded – undo
1037 1037
 		$forms                    = FrmForm::get_published_forms( $where );
1038 1038
 		$view_path                = FrmAppHelper::plugin_path() . '/classes/views/frm-forms/';
1039 1039
 
1040
-		$templates_by_category[ $my_templates_translation ] = $custom_templates;
1040
+		$templates_by_category[$my_templates_translation] = $custom_templates;
1041 1041
 
1042 1042
 		unset( $pricing, $license_type, $where );
1043 1043
 		wp_enqueue_script( 'accordion' ); // register accordion for template groups
@@ -1293,7 +1293,7 @@  discard block
 block discarded – undo
1293 1293
 
1294 1294
 		foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) {
1295 1295
 			if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
1296
-				unset( $sections[ $feature ] );
1296
+				unset( $sections[$feature] );
1297 1297
 			}
1298 1298
 		}
1299 1299
 
@@ -1326,7 +1326,7 @@  discard block
 block discarded – undo
1326 1326
 				$section['id'] = $section['anchor'];
1327 1327
 			}
1328 1328
 
1329
-			$sections[ $key ] = $section;
1329
+			$sections[$key] = $section;
1330 1330
 		}
1331 1331
 
1332 1332
 		return $sections;
@@ -1444,7 +1444,7 @@  discard block
 block discarded – undo
1444 1444
 		if ( ! empty( $user_fields ) ) {
1445 1445
 			$user_helpers = array();
1446 1446
 			foreach ( $user_fields as $uk => $uf ) {
1447
-				$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1447
+				$user_helpers['|user_id| show="' . $uk . '"'] = $uf;
1448 1448
 				unset( $uk, $uf );
1449 1449
 			}
1450 1450
 
@@ -1583,7 +1583,7 @@  discard block
 block discarded – undo
1583 1583
 		if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
1584 1584
 			$frm_vars['js_validate_forms'] = array();
1585 1585
 		}
1586
-		$frm_vars['js_validate_forms'][ $form->id ] = $form;
1586
+		$frm_vars['js_validate_forms'][$form->id] = $form;
1587 1587
 	}
1588 1588
 
1589 1589
 	public static function get_email_html() {
@@ -1742,7 +1742,7 @@  discard block
 block discarded – undo
1742 1742
 				add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
1743 1743
 			} else {
1744 1744
 				$vars   = FrmAppHelper::json_to_array( $json_vars );
1745
-				$action = $vars[ $action ];
1745
+				$action = $vars[$action];
1746 1746
 				unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
1747 1747
 				$_REQUEST = array_merge( $_REQUEST, $vars ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
1748 1748
 				$_POST    = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
@@ -1876,7 +1876,7 @@  discard block
 block discarded – undo
1876 1876
 		$actions = array();
1877 1877
 		foreach ( $frm_vars['forms_loaded'] as $form ) {
1878 1878
 			if ( is_object( $form ) ) {
1879
-				$actions[ $form->id ] = $form->name;
1879
+				$actions[$form->id] = $form->name;
1880 1880
 			}
1881 1881
 			unset( $form );
1882 1882
 		}
@@ -2120,8 +2120,8 @@  discard block
 block discarded – undo
2120 2120
 	private static function get_saved_errors( $form, $params ) {
2121 2121
 		global $frm_vars;
2122 2122
 
2123
-		if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2124
-			$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2123
+		if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][$form->id] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2124
+			$errors = $frm_vars['created_entries'][$form->id]['errors'];
2125 2125
 		} else {
2126 2126
 			$errors = array();
2127 2127
 		}
@@ -2143,7 +2143,7 @@  discard block
 block discarded – undo
2143 2143
 	public static function just_created_entry( $form_id ) {
2144 2144
 		global $frm_vars;
2145 2145
 
2146
-		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;
2146
+		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;
2147 2147
 	}
2148 2148
 
2149 2149
 	/**
@@ -2163,7 +2163,7 @@  discard block
 block discarded – undo
2163 2163
 	private static function get_confirmation_method( $atts ) {
2164 2164
 		$action = FrmOnSubmitHelper::current_event( $atts );
2165 2165
 		$opt    = 'update' === $action ? 'edit_action' : 'success_action';
2166
-		$method = ( isset( $atts['form']->options[ $opt ] ) && ! empty( $atts['form']->options[ $opt ] ) ) ? $atts['form']->options[ $opt ] : 'message';
2166
+		$method = ( isset( $atts['form']->options[$opt] ) && ! empty( $atts['form']->options[$opt] ) ) ? $atts['form']->options[$opt] : 'message';
2167 2167
 
2168 2168
 		if ( ! empty( $atts['entry_id'] ) ) {
2169 2169
 			$met_actions = self::get_met_on_submit_actions( $atts, $action );
@@ -2184,7 +2184,7 @@  discard block
 block discarded – undo
2184 2184
 	public static function maybe_trigger_redirect( $form, $params, $args ) {
2185 2185
 		if ( ! isset( $params['id'] ) ) {
2186 2186
 			global $frm_vars;
2187
-			$params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id'];
2187
+			$params['id'] = $frm_vars['created_entries'][$form->id]['entry_id'];
2188 2188
 		}
2189 2189
 
2190 2190
 		$conf_method = self::get_confirmation_method(
@@ -2266,7 +2266,7 @@  discard block
 block discarded – undo
2266 2266
 		$args['success_opt'] = $opt;
2267 2267
 		$args['ajax']        = ! empty( $frm_vars['ajax'] );
2268 2268
 
2269
-		if ( $args['conf_method'] === 'page' && is_numeric( $args['form']->options[ $opt . '_page_id' ] ) ) {
2269
+		if ( $args['conf_method'] === 'page' && is_numeric( $args['form']->options[$opt . '_page_id'] ) ) {
2270 2270
 			self::load_page_after_submit( $args );
2271 2271
 		} elseif ( $args['conf_method'] === 'redirect' ) {
2272 2272
 			self::redirect_after_submit( $args );
@@ -2290,7 +2290,7 @@  discard block
 block discarded – undo
2290 2290
 		}
2291 2291
 
2292 2292
 		// If a redirect action has already opened the URL in a new tab, we show the default message in the currect tab.
2293
-		if ( ! empty( self::$redirected_in_new_tab[ $args['form']->id ] ) ) {
2293
+		if ( ! empty( self::$redirected_in_new_tab[$args['form']->id] ) ) {
2294 2294
 			return array( FrmOnSubmitHelper::get_fallback_action_after_open_in_new_tab( $event ) );
2295 2295
 		}
2296 2296
 
@@ -2477,7 +2477,7 @@  discard block
 block discarded – undo
2477 2477
 
2478 2478
 		$opt = 'update' === $args['action'] ? 'edit_' : 'success_';
2479 2479
 
2480
-		$new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ];
2480
+		$new_args['conf_method'] = $new_args['form']->options[$opt . 'action'];
2481 2481
 
2482 2482
 		/**
2483 2483
 		 * Filters the run success action args.
@@ -2497,8 +2497,8 @@  discard block
 block discarded – undo
2497 2497
 	private static function load_page_after_submit( $args ) {
2498 2498
 		global $post;
2499 2499
 		$opt = $args['success_opt'];
2500
-		if ( ! $post || $args['form']->options[ $opt . '_page_id' ] != $post->ID ) {
2501
-			$page     = get_post( $args['form']->options[ $opt . '_page_id' ] );
2500
+		if ( ! $post || $args['form']->options[$opt . '_page_id'] != $post->ID ) {
2501
+			$page     = get_post( $args['form']->options[$opt . '_page_id'] );
2502 2502
 			$old_post = $post;
2503 2503
 			$post     = $page;
2504 2504
 			$content  = apply_filters( 'frm_content', $page->post_content, $args['form'], $args['entry_id'] );
@@ -2528,7 +2528,7 @@  discard block
 block discarded – undo
2528 2528
 		add_filter( 'frm_use_wpautop', '__return_false' );
2529 2529
 
2530 2530
 		$opt         = $args['success_opt'];
2531
-		$success_url = trim( $args['form']->options[ $opt . '_url' ] );
2531
+		$success_url = trim( $args['form']->options[$opt . '_url'] );
2532 2532
 		$success_url = apply_filters( 'frm_content', $success_url, $args['form'], $args['entry_id'] );
2533 2533
 		$success_url = do_shortcode( $success_url );
2534 2534
 
@@ -2548,7 +2548,7 @@  discard block
 block discarded – undo
2548 2548
 		if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) ) { // Not AJAX submit, no headers sent, and there is just one Redirect action runs.
2549 2549
 			if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
2550 2550
 				self::print_open_in_new_tab_js_with_fallback_handler( $success_url, $args );
2551
-				self::$redirected_in_new_tab[ $args['form']->id ] = 1;
2551
+				self::$redirected_in_new_tab[$args['form']->id] = 1;
2552 2552
 				return;
2553 2553
 			}
2554 2554
 
@@ -2808,7 +2808,7 @@  discard block
 block discarded – undo
2808 2808
 			'description' => false,
2809 2809
 			'reset'       => false,
2810 2810
 		);
2811
-		$args     = wp_parse_args( $args, $defaults );
2811
+		$args = wp_parse_args( $args, $defaults );
2812 2812
 	}
2813 2813
 
2814 2814
 	/**
@@ -2846,7 +2846,7 @@  discard block
 block discarded – undo
2846 2846
 		$opt          = isset( $args['success_opt'] ) ? $args['success_opt'] : 'success';
2847 2847
 
2848 2848
 		if ( $entry_id && is_numeric( $entry_id ) ) {
2849
-			$message = isset( $form->options[ $opt . '_msg' ] ) ? $form->options[ $opt . '_msg' ] : $frm_settings->success_msg;
2849
+			$message = isset( $form->options[$opt . '_msg'] ) ? $form->options[$opt . '_msg'] : $frm_settings->success_msg;
2850 2850
 			$class   = 'frm_message';
2851 2851
 		} else {
2852 2852
 			$message = $frm_settings->failed_msg;
@@ -3070,7 +3070,7 @@  discard block
 block discarded – undo
3070 3070
 
3071 3071
 		check_ajax_referer( 'frm_ajax', 'nonce' );
3072 3072
 
3073
-		$html             = FrmAppHelper::clip(
3073
+		$html = FrmAppHelper::clip(
3074 3074
 			function() {
3075 3075
 				FrmAppHelper::maybe_autocomplete_pages_options(
3076 3076
 					array(
Please login to merge, or discard this patch.