Completed
Pull Request — master (#1033)
by Stephanie
34s
created
classes/controllers/FrmFormsController.php 2 patches
Spacing   +45 added lines, -45 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,
@@ -1000,11 +1000,11 @@  discard block
 block discarded – undo
1000 1000
 			}
1001 1001
 
1002 1002
 			foreach ( $template['categories'] as $category ) {
1003
-				if ( ! isset( $templates_by_category[ $category ] ) ) {
1004
-					$templates_by_category[ $category ] = array();
1003
+				if ( ! isset( $templates_by_category[$category] ) ) {
1004
+					$templates_by_category[$category] = array();
1005 1005
 				}
1006 1006
 
1007
-				$templates_by_category[ $category ][] = $template;
1007
+				$templates_by_category[$category][] = $template;
1008 1008
 			}
1009 1009
 		}
1010 1010
 		unset( $template );
@@ -1033,7 +1033,7 @@  discard block
 block discarded – undo
1033 1033
 		$forms                    = FrmForm::get_published_forms( $where );
1034 1034
 		$view_path                = FrmAppHelper::plugin_path() . '/classes/views/frm-forms/';
1035 1035
 
1036
-		$templates_by_category[ $my_templates_translation ] = $custom_templates;
1036
+		$templates_by_category[$my_templates_translation] = $custom_templates;
1037 1037
 
1038 1038
 		unset( $pricing, $license_type, $where );
1039 1039
 		wp_enqueue_script( 'accordion' ); // register accordion for template groups
@@ -1276,7 +1276,7 @@  discard block
 block discarded – undo
1276 1276
 
1277 1277
 		foreach ( array( 'landing', 'chat' ) as $feature ) {
1278 1278
 			if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
1279
-				unset( $sections[ $feature ] );
1279
+				unset( $sections[$feature] );
1280 1280
 			}
1281 1281
 		}
1282 1282
 
@@ -1309,7 +1309,7 @@  discard block
 block discarded – undo
1309 1309
 				$section['id'] = $section['anchor'];
1310 1310
 			}
1311 1311
 
1312
-			$sections[ $key ] = $section;
1312
+			$sections[$key] = $section;
1313 1313
 		}
1314 1314
 
1315 1315
 		return $sections;
@@ -1427,7 +1427,7 @@  discard block
 block discarded – undo
1427 1427
 		if ( ! empty( $user_fields ) ) {
1428 1428
 			$user_helpers = array();
1429 1429
 			foreach ( $user_fields as $uk => $uf ) {
1430
-				$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1430
+				$user_helpers['|user_id| show="' . $uk . '"'] = $uf;
1431 1431
 				unset( $uk, $uf );
1432 1432
 			}
1433 1433
 
@@ -1559,7 +1559,7 @@  discard block
 block discarded – undo
1559 1559
 		if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
1560 1560
 			$frm_vars['js_validate_forms'] = array();
1561 1561
 		}
1562
-		$frm_vars['js_validate_forms'][ $form->id ] = $form;
1562
+		$frm_vars['js_validate_forms'][$form->id] = $form;
1563 1563
 	}
1564 1564
 
1565 1565
 	public static function get_email_html() {
@@ -1714,7 +1714,7 @@  discard block
 block discarded – undo
1714 1714
 				add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
1715 1715
 			} else {
1716 1716
 				$vars   = FrmAppHelper::json_to_array( $json_vars );
1717
-				$action = $vars[ $action ];
1717
+				$action = $vars[$action];
1718 1718
 				unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
1719 1719
 				$_REQUEST = array_merge( $_REQUEST, $vars ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
1720 1720
 				$_POST    = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
@@ -1848,7 +1848,7 @@  discard block
 block discarded – undo
1848 1848
 		$actions = array();
1849 1849
 		foreach ( $frm_vars['forms_loaded'] as $form ) {
1850 1850
 			if ( is_object( $form ) ) {
1851
-				$actions[ $form->id ] = $form->name;
1851
+				$actions[$form->id] = $form->name;
1852 1852
 			}
1853 1853
 			unset( $form );
1854 1854
 		}
@@ -2090,8 +2090,8 @@  discard block
 block discarded – undo
2090 2090
 	private static function get_saved_errors( $form, $params ) {
2091 2091
 		global $frm_vars;
2092 2092
 
2093
-		if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2094
-			$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2093
+		if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][$form->id] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2094
+			$errors = $frm_vars['created_entries'][$form->id]['errors'];
2095 2095
 		} else {
2096 2096
 			$errors = array();
2097 2097
 		}
@@ -2113,7 +2113,7 @@  discard block
 block discarded – undo
2113 2113
 	public static function just_created_entry( $form_id ) {
2114 2114
 		global $frm_vars;
2115 2115
 
2116
-		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;
2116
+		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;
2117 2117
 	}
2118 2118
 
2119 2119
 	/**
@@ -2137,7 +2137,7 @@  discard block
 block discarded – undo
2137 2137
 		}
2138 2138
 
2139 2139
 		$opt    = 'success_action';
2140
-		$method = ( isset( $atts['form']->options[ $opt ] ) && ! empty( $atts['form']->options[ $opt ] ) ) ? $atts['form']->options[ $opt ] : 'message';
2140
+		$method = ( isset( $atts['form']->options[$opt] ) && ! empty( $atts['form']->options[$opt] ) ) ? $atts['form']->options[$opt] : 'message';
2141 2141
 		$method = apply_filters( 'frm_success_filter', $method, $atts['form'], 'create' );
2142 2142
 
2143 2143
 		if ( $method != 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
@@ -2150,7 +2150,7 @@  discard block
 block discarded – undo
2150 2150
 	public static function maybe_trigger_redirect( $form, $params, $args ) {
2151 2151
 		if ( ! isset( $params['id'] ) ) {
2152 2152
 			global $frm_vars;
2153
-			$params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id'];
2153
+			$params['id'] = $frm_vars['created_entries'][$form->id]['entry_id'];
2154 2154
 		}
2155 2155
 
2156 2156
 		$conf_method = self::get_confirmation_method(
@@ -2209,7 +2209,7 @@  discard block
 block discarded – undo
2209 2209
 		$args['success_opt'] = $opt;
2210 2210
 		$args['ajax']        = ! empty( $frm_vars['ajax'] );
2211 2211
 
2212
-		if ( $args['conf_method'] === 'page' && is_numeric( $args['form']->options[ $opt . '_page_id' ] ) ) {
2212
+		if ( $args['conf_method'] === 'page' && is_numeric( $args['form']->options[$opt . '_page_id'] ) ) {
2213 2213
 			self::load_page_after_submit( $args );
2214 2214
 		} elseif ( $args['conf_method'] === 'redirect' ) {
2215 2215
 			self::redirect_after_submit( $args );
@@ -2352,7 +2352,7 @@  discard block
 block discarded – undo
2352 2352
 
2353 2353
 		$opt = 'update' === $args['action'] ? 'edit_' : 'success_';
2354 2354
 
2355
-		$new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ];
2355
+		$new_args['conf_method'] = $new_args['form']->options[$opt . 'action'];
2356 2356
 
2357 2357
 		/**
2358 2358
 		 * Filters the run success action args.
@@ -2372,8 +2372,8 @@  discard block
 block discarded – undo
2372 2372
 	private static function load_page_after_submit( $args ) {
2373 2373
 		global $post;
2374 2374
 		$opt = $args['success_opt'];
2375
-		if ( ! $post || $args['form']->options[ $opt . '_page_id' ] != $post->ID ) {
2376
-			$page     = get_post( $args['form']->options[ $opt . '_page_id' ] );
2375
+		if ( ! $post || $args['form']->options[$opt . '_page_id'] != $post->ID ) {
2376
+			$page     = get_post( $args['form']->options[$opt . '_page_id'] );
2377 2377
 			$old_post = $post;
2378 2378
 			$post     = $page;
2379 2379
 			$content  = apply_filters( 'frm_content', $page->post_content, $args['form'], $args['entry_id'] );
@@ -2390,7 +2390,7 @@  discard block
 block discarded – undo
2390 2390
 		add_filter( 'frm_use_wpautop', '__return_false' );
2391 2391
 
2392 2392
 		$opt         = $args['success_opt'];
2393
-		$success_url = trim( $args['form']->options[ $opt . '_url' ] );
2393
+		$success_url = trim( $args['form']->options[$opt . '_url'] );
2394 2394
 		$success_url = apply_filters( 'frm_content', $success_url, $args['form'], $args['entry_id'] );
2395 2395
 		$success_url = do_shortcode( $success_url );
2396 2396
 
@@ -2429,7 +2429,7 @@  discard block
 block discarded – undo
2429 2429
 	 * @param array $args See {@see FrmFormsController::run_success_action()}.
2430 2430
 	 */
2431 2431
 	private static function redirect_after_submit_using_js( $args ) {
2432
-		$success_msg  = isset( $args['form']->options[ $args['success_opt'] . '_msg' ] ) ? $args['form']->options[ $args['success_opt'] . '_msg' ] : __( 'Please wait while you are redirected.', 'formidable' );
2432
+		$success_msg  = isset( $args['form']->options[$args['success_opt'] . '_msg'] ) ? $args['form']->options[$args['success_opt'] . '_msg'] : __( 'Please wait while you are redirected.', 'formidable' );
2433 2433
 		$redirect_msg = self::get_redirect_message( $args['success_url'], $success_msg, $args );
2434 2434
 		$delay_time   = $args['time_to_read'];
2435 2435
 
@@ -2559,7 +2559,7 @@  discard block
 block discarded – undo
2559 2559
 			'description' => false,
2560 2560
 			'reset'       => false,
2561 2561
 		);
2562
-		$args     = wp_parse_args( $args, $defaults );
2562
+		$args = wp_parse_args( $args, $defaults );
2563 2563
 	}
2564 2564
 
2565 2565
 	/**
@@ -2811,7 +2811,7 @@  discard block
 block discarded – undo
2811 2811
 
2812 2812
 		check_ajax_referer( 'frm_ajax', 'nonce' );
2813 2813
 
2814
-		$html             = FrmAppHelper::clip(
2814
+		$html = FrmAppHelper::clip(
2815 2815
 			function() {
2816 2816
 				FrmAppHelper::maybe_autocomplete_pages_options(
2817 2817
 					array(
@@ -2882,28 +2882,28 @@  discard block
 block discarded – undo
2882 2882
 	public static function populate_on_submit_data( &$form_options, $action = null, $event = 'create' ) {
2883 2883
 		$opt = 'update' === $event ? 'edit_' : 'success_';
2884 2884
 		if ( ! $action || ! is_object( $action ) ) {
2885
-			$form_options[ $opt . 'action' ] = FrmOnSubmitHelper::get_default_action_type();
2886
-			$form_options[ $opt . 'msg' ]    = FrmOnSubmitHelper::get_default_msg();
2885
+			$form_options[$opt . 'action'] = FrmOnSubmitHelper::get_default_action_type();
2886
+			$form_options[$opt . 'msg']    = FrmOnSubmitHelper::get_default_msg();
2887 2887
 			return;
2888 2888
 		}
2889 2889
 
2890
-		$form_options[ $opt . 'action' ] = isset( $action->post_content['success_action'] ) ? $action->post_content['success_action'] : 'message';
2890
+		$form_options[$opt . 'action'] = isset( $action->post_content['success_action'] ) ? $action->post_content['success_action'] : 'message';
2891 2891
 
2892
-		switch ( $form_options[ $opt . 'action' ] ) {
2892
+		switch ( $form_options[$opt . 'action'] ) {
2893 2893
 			case 'redirect':
2894
-				$form_options[ $opt . 'url' ] = isset( $action->post_content['success_url'] ) ? $action->post_content['success_url'] : '';
2894
+				$form_options[$opt . 'url'] = isset( $action->post_content['success_url'] ) ? $action->post_content['success_url'] : '';
2895 2895
 				$form_options['redirect_msg'] = isset( $action->post_content['redirect_msg'] ) ? $action->post_content['redirect_msg'] : FrmOnSubmitHelper::get_default_redirect_msg();
2896
-				$form_options[ $opt . 'msg' ] = $form_options['redirect_msg'];
2896
+				$form_options[$opt . 'msg'] = $form_options['redirect_msg'];
2897 2897
 				$form_options['time_to_read'] = isset( $action->post_content['time_to_read'] ) ? $action->post_content['time_to_read'] : 0;
2898 2898
 				break;
2899 2899
 
2900 2900
 			case 'page':
2901
-				$form_options[ $opt . 'page_id' ] = isset( $action->post_content['success_page_id'] ) ? $action->post_content['success_page_id'] : '';
2901
+				$form_options[$opt . 'page_id'] = isset( $action->post_content['success_page_id'] ) ? $action->post_content['success_page_id'] : '';
2902 2902
 				break;
2903 2903
 
2904 2904
 			default:
2905
-				$form_options[ $opt . 'msg' ] = ! empty( $action->post_content['success_msg'] ) ? $action->post_content['success_msg'] : FrmOnSubmitHelper::get_default_msg();
2906
-				$form_options['show_form']   = ! empty( $action->post_content['show_form'] );
2905
+				$form_options[$opt . 'msg'] = ! empty( $action->post_content['success_msg'] ) ? $action->post_content['success_msg'] : FrmOnSubmitHelper::get_default_msg();
2906
+				$form_options['show_form'] = ! empty( $action->post_content['show_form'] );
2907 2907
 		}
2908 2908
 	}
2909 2909
 
@@ -2981,21 +2981,21 @@  discard block
 block discarded – undo
2981 2981
 	private static function get_on_submit_action_data_from_form_options( $form_options, $event = 'create' ) {
2982 2982
 		$opt  = 'update' === $event ? 'edit_' : 'success_';
2983 2983
 		$data = array(
2984
-			'success_action' => $form_options[ $opt . 'action' ],
2984
+			'success_action' => $form_options[$opt . 'action'],
2985 2985
 		);
2986 2986
 
2987
-		switch ( $form_options[ $opt . 'action' ] ) {
2987
+		switch ( $form_options[$opt . 'action'] ) {
2988 2988
 			case 'redirect':
2989
-				$data['success_url']  = isset( $form_options[ $opt . 'url' ] ) ? $form_options[ $opt . 'url' ] : '';
2990
-				$data['redirect_msg'] = isset( $form_options[ $opt . 'msg' ] ) ? $form_options[ $opt . 'msg' ] : FrmOnSubmitHelper::get_default_redirect_msg();
2989
+				$data['success_url']  = isset( $form_options[$opt . 'url'] ) ? $form_options[$opt . 'url'] : '';
2990
+				$data['redirect_msg'] = isset( $form_options[$opt . 'msg'] ) ? $form_options[$opt . 'msg'] : FrmOnSubmitHelper::get_default_redirect_msg();
2991 2991
 				break;
2992 2992
 
2993 2993
 			case 'page':
2994
-				$data['success_page_id'] = isset( $form_options[ $opt . 'page_id' ] ) ? $form_options[ $opt . 'page_id' ] : '';
2994
+				$data['success_page_id'] = isset( $form_options[$opt . 'page_id'] ) ? $form_options[$opt . 'page_id'] : '';
2995 2995
 				break;
2996 2996
 
2997 2997
 			default:
2998
-				$data['success_msg'] = isset( $form_options[ $opt . 'msg' ] ) ? $form_options[ $opt . 'msg' ] : FrmOnSubmitHelper::get_default_msg();
2998
+				$data['success_msg'] = isset( $form_options[$opt . 'msg'] ) ? $form_options[$opt . 'msg'] : FrmOnSubmitHelper::get_default_msg();
2999 2999
 				$data['show_form']   = ! empty( $form_options['show_form'] );
3000 3000
 		}
3001 3001
 
@@ -3030,8 +3030,8 @@  discard block
 block discarded – undo
3030 3030
 		}
3031 3031
 
3032 3032
 		foreach ( $options as $name ) {
3033
-			if ( isset( $form->options[ $name ] ) ) {
3034
-				unset( $form->options[ $name ] );
3033
+			if ( isset( $form->options[$name] ) ) {
3034
+				unset( $form->options[$name] );
3035 3035
 			}
3036 3036
 		}
3037 3037
 
Please login to merge, or discard this patch.
Braces   +12 added lines, -6 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
 
@@ -2412,7 +2416,8 @@  discard block
 block discarded – undo
2412 2416
 				)
2413 2417
 			);
2414 2418
 			wp_die();
2415
-		} elseif ( ! headers_sent() && empty( $args['time_to_read'] ) ) { // Not AJAX submit and there is just one On Submit action runs.
2419
+		} elseif ( ! headers_sent() && empty( $args['time_to_read'] ) ) {
2420
+// Not AJAX submit and there is just one On Submit action runs.
2416 2421
 			wp_redirect( esc_url_raw( $success_url ) );
2417 2422
 			die(); // do not use wp_die or redirect fails
2418 2423
 		}
@@ -2437,7 +2442,8 @@  discard block
 block discarded – undo
2437 2442
 
2438 2443
 		echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2439 2444
 		echo '<script>';
2440
-		if ( empty( $args['doing_ajax'] ) ) { // Not AJAX submit, delay JS until window.load.
2445
+		if ( empty( $args['doing_ajax'] ) ) {
2446
+// Not AJAX submit, delay JS until window.load.
2441 2447
 			echo 'window.onload=function(){';
2442 2448
 		}
2443 2449
 		echo 'setTimeout(function(){window.location="' . esc_url_raw( $args['success_url'] ) . '";}, ' . intval( $delay_time ) . ');';
Please login to merge, or discard this patch.