Completed
Pull Request — master (#1842)
by Viktor
35s
created
classes/controllers/FrmFormsController.php 1 patch
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -647,7 +647,7 @@  discard block
 block discarded – undo
647 647
 			 * @param string|null $src
648 648
 			 * @return string
649 649
 			 */
650
-			function ( $src ) {
650
+			function( $src ) {
651 651
 				if ( is_null( $src ) ) {
652 652
 					$src = '';
653 653
 				}
@@ -712,11 +712,11 @@  discard block
 block discarded – undo
712 712
 			),
713 713
 		);
714 714
 
715
-		if ( ! isset( $available_status[ $status ] ) ) {
715
+		if ( ! isset( $available_status[$status] ) ) {
716 716
 			return;
717 717
 		}
718 718
 
719
-		FrmAppHelper::permission_check( $available_status[ $status ]['permission'] );
719
+		FrmAppHelper::permission_check( $available_status[$status]['permission'] );
720 720
 
721 721
 		$params = FrmForm::list_page_params();
722 722
 
@@ -724,8 +724,8 @@  discard block
 block discarded – undo
724 724
 		check_admin_referer( $status . '_form_' . $params['id'] );
725 725
 
726 726
 		$count = 0;
727
-		if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
728
-			++$count;
727
+		if ( FrmForm::set_status( $params['id'], $available_status[$status]['new_status'] ) ) {
728
+			++ $count;
729 729
 		}
730 730
 
731 731
 		$form_type = FrmAppHelper::get_simple_request(
@@ -741,7 +741,7 @@  discard block
 block discarded – undo
741 741
 		/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
742 742
 		$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>' );
743 743
 
744
-		$message = $available_status[ $status ]['message'];
744
+		$message = $available_status[$status]['message'];
745 745
 
746 746
 		self::display_forms_list( $params, $message );
747 747
 	}
@@ -756,7 +756,7 @@  discard block
 block discarded – undo
756 756
 		$count = 0;
757 757
 		foreach ( $ids as $id ) {
758 758
 			if ( FrmForm::trash( $id ) ) {
759
-				++$count;
759
+				++ $count;
760 760
 			}
761 761
 		}
762 762
 
@@ -766,7 +766,7 @@  discard block
 block discarded – undo
766 766
 				'type'  => 'request',
767 767
 			)
768 768
 		);
769
-		$message      = sprintf(
769
+		$message = sprintf(
770 770
 			/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
771 771
 			_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' ),
772 772
 			$count,
@@ -787,7 +787,7 @@  discard block
 block discarded – undo
787 787
 
788 788
 		$count = 0;
789 789
 		if ( FrmForm::destroy( $params['id'] ) ) {
790
-			++$count;
790
+			++ $count;
791 791
 		}
792 792
 
793 793
 		/* translators: %1$s: Number of forms */
@@ -807,7 +807,7 @@  discard block
 block discarded – undo
807 807
 		foreach ( $ids as $id ) {
808 808
 			$d = FrmForm::destroy( $id );
809 809
 			if ( $d ) {
810
-				++$count;
810
+				++ $count;
811 811
 			}
812 812
 		}
813 813
 
@@ -1301,7 +1301,7 @@  discard block
 block discarded – undo
1301 1301
 
1302 1302
 		add_action(
1303 1303
 			'wp_enqueue_editor',
1304
-			function () {
1304
+			function() {
1305 1305
 				wp_print_media_templates();
1306 1306
 			}
1307 1307
 		);
@@ -1406,7 +1406,7 @@  discard block
 block discarded – undo
1406 1406
 
1407 1407
 		foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) {
1408 1408
 			if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
1409
-				unset( $sections[ $feature ] );
1409
+				unset( $sections[$feature] );
1410 1410
 			}
1411 1411
 		}
1412 1412
 
@@ -1434,7 +1434,7 @@  discard block
 block discarded – undo
1434 1434
 				$section['id'] = $section['anchor'];
1435 1435
 			}
1436 1436
 
1437
-			$sections[ $key ] = $section;
1437
+			$sections[$key] = $section;
1438 1438
 		}//end foreach
1439 1439
 
1440 1440
 		return $sections;
@@ -1557,7 +1557,7 @@  discard block
 block discarded – undo
1557 1557
 		if ( $user_fields ) {
1558 1558
 			$user_helpers = array();
1559 1559
 			foreach ( $user_fields as $uk => $uf ) {
1560
-				$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1560
+				$user_helpers['|user_id| show="' . $uk . '"'] = $uf;
1561 1561
 				unset( $uk, $uf );
1562 1562
 			}
1563 1563
 
@@ -1696,7 +1696,7 @@  discard block
 block discarded – undo
1696 1696
 		if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
1697 1697
 			$frm_vars['js_validate_forms'] = array();
1698 1698
 		}
1699
-		$frm_vars['js_validate_forms'][ $form->id ] = $form;
1699
+		$frm_vars['js_validate_forms'][$form->id] = $form;
1700 1700
 	}
1701 1701
 
1702 1702
 	public static function get_email_html() {
@@ -1867,7 +1867,7 @@  discard block
 block discarded – undo
1867 1867
 				add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
1868 1868
 			} else {
1869 1869
 				$vars   = FrmAppHelper::json_to_array( $json_vars );
1870
-				$action = $vars[ $action ];
1870
+				$action = $vars[$action];
1871 1871
 				unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
1872 1872
 				$_REQUEST = array_merge( $_REQUEST, $vars ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
1873 1873
 				$_POST    = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
@@ -2040,7 +2040,7 @@  discard block
 block discarded – undo
2040 2040
 		$actions = array();
2041 2041
 		foreach ( $frm_vars['forms_loaded'] as $form ) {
2042 2042
 			if ( is_object( $form ) ) {
2043
-				$actions[ $form->id ] = $form->name;
2043
+				$actions[$form->id] = $form->name;
2044 2044
 			}
2045 2045
 			unset( $form );
2046 2046
 		}
@@ -2285,8 +2285,8 @@  discard block
 block discarded – undo
2285 2285
 	private static function get_saved_errors( $form, $params ) {
2286 2286
 		global $frm_vars;
2287 2287
 
2288
-		if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2289
-			$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2288
+		if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][$form->id] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2289
+			$errors = $frm_vars['created_entries'][$form->id]['errors'];
2290 2290
 		} else {
2291 2291
 			$errors = array();
2292 2292
 		}
@@ -2308,7 +2308,7 @@  discard block
 block discarded – undo
2308 2308
 	public static function just_created_entry( $form_id ) {
2309 2309
 		global $frm_vars;
2310 2310
 
2311
-		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;
2311
+		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;
2312 2312
 	}
2313 2313
 
2314 2314
 	/**
@@ -2328,7 +2328,7 @@  discard block
 block discarded – undo
2328 2328
 	private static function get_confirmation_method( $atts ) {
2329 2329
 		$action = FrmOnSubmitHelper::current_event( $atts );
2330 2330
 		$opt    = 'update' === $action ? 'edit_action' : 'success_action';
2331
-		$method = ! empty( $atts['form']->options[ $opt ] ) ? $atts['form']->options[ $opt ] : 'message';
2331
+		$method = ! empty( $atts['form']->options[$opt] ) ? $atts['form']->options[$opt] : 'message';
2332 2332
 
2333 2333
 		if ( ! empty( $atts['entry_id'] ) ) {
2334 2334
 			$met_actions = self::get_met_on_submit_actions( $atts, $action );
@@ -2349,7 +2349,7 @@  discard block
 block discarded – undo
2349 2349
 	public static function maybe_trigger_redirect( $form, $params, $args ) {
2350 2350
 		if ( ! isset( $params['id'] ) ) {
2351 2351
 			global $frm_vars;
2352
-			$params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id'];
2352
+			$params['id'] = $frm_vars['created_entries'][$form->id]['entry_id'];
2353 2353
 		}
2354 2354
 
2355 2355
 		$conf_method = self::get_confirmation_method(
@@ -2431,7 +2431,7 @@  discard block
 block discarded – undo
2431 2431
 		$args['success_opt'] = $opt;
2432 2432
 		$args['ajax']        = ! empty( $frm_vars['ajax'] );
2433 2433
 
2434
-		if ( $args['conf_method'] === 'page' && is_numeric( $args['form']->options[ $opt . '_page_id' ] ) ) {
2434
+		if ( $args['conf_method'] === 'page' && is_numeric( $args['form']->options[$opt . '_page_id'] ) ) {
2435 2435
 			self::load_page_after_submit( $args );
2436 2436
 		} elseif ( $args['conf_method'] === 'redirect' ) {
2437 2437
 			self::redirect_after_submit( $args );
@@ -2455,7 +2455,7 @@  discard block
 block discarded – undo
2455 2455
 		}
2456 2456
 
2457 2457
 		// If a redirect action has already opened the URL in a new tab, we show the default message in the current tab.
2458
-		if ( ! empty( self::$redirected_in_new_tab[ $args['form']->id ] ) ) {
2458
+		if ( ! empty( self::$redirected_in_new_tab[$args['form']->id] ) ) {
2459 2459
 			return array( FrmOnSubmitHelper::get_fallback_action_after_open_in_new_tab( $event ) );
2460 2460
 		}
2461 2461
 
@@ -2643,7 +2643,7 @@  discard block
 block discarded – undo
2643 2643
 
2644 2644
 		$opt = 'update' === $args['action'] ? 'edit_' : 'success_';
2645 2645
 
2646
-		$new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ];
2646
+		$new_args['conf_method'] = $new_args['form']->options[$opt . 'action'];
2647 2647
 
2648 2648
 		/**
2649 2649
 		 * Filters the run success action args.
@@ -2663,8 +2663,8 @@  discard block
 block discarded – undo
2663 2663
 	private static function load_page_after_submit( $args ) {
2664 2664
 		global $post;
2665 2665
 		$opt = $args['success_opt'];
2666
-		if ( ! $post || $args['form']->options[ $opt . '_page_id' ] != $post->ID ) {
2667
-			$page     = get_post( $args['form']->options[ $opt . '_page_id' ] );
2666
+		if ( ! $post || $args['form']->options[$opt . '_page_id'] != $post->ID ) {
2667
+			$page     = get_post( $args['form']->options[$opt . '_page_id'] );
2668 2668
 			$old_post = $post;
2669 2669
 			$post     = $page;
2670 2670
 			$content  = apply_filters( 'frm_content', $page->post_content, $args['form'], $args['entry_id'] );
@@ -2694,7 +2694,7 @@  discard block
 block discarded – undo
2694 2694
 		add_filter( 'frm_use_wpautop', '__return_false' );
2695 2695
 
2696 2696
 		$opt         = $args['success_opt'];
2697
-		$success_url = trim( $args['form']->options[ $opt . '_url' ] );
2697
+		$success_url = trim( $args['form']->options[$opt . '_url'] );
2698 2698
 		$success_url = apply_filters( 'frm_content', $success_url, $args['form'], $args['entry_id'] );
2699 2699
 		$success_url = do_shortcode( $success_url );
2700 2700
 
@@ -2716,7 +2716,7 @@  discard block
 block discarded – undo
2716 2716
 			// Not AJAX submit, no headers sent, and there is just one Redirect action runs.
2717 2717
 			if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
2718 2718
 				self::print_open_in_new_tab_js_with_fallback_handler( $success_url, $args );
2719
-				self::$redirected_in_new_tab[ $args['form']->id ] = 1;
2719
+				self::$redirected_in_new_tab[$args['form']->id] = 1;
2720 2720
 				return;
2721 2721
 			}
2722 2722
 
@@ -2976,7 +2976,7 @@  discard block
 block discarded – undo
2976 2976
 			'description' => false,
2977 2977
 			'reset'       => false,
2978 2978
 		);
2979
-		$args     = wp_parse_args( $args, $defaults );
2979
+		$args = wp_parse_args( $args, $defaults );
2980 2980
 	}
2981 2981
 
2982 2982
 	/**
@@ -3014,7 +3014,7 @@  discard block
 block discarded – undo
3014 3014
 		$opt          = isset( $args['success_opt'] ) ? $args['success_opt'] : 'success';
3015 3015
 
3016 3016
 		if ( $entry_id && is_numeric( $entry_id ) ) {
3017
-			$message = isset( $form->options[ $opt . '_msg' ] ) ? $form->options[ $opt . '_msg' ] : $frm_settings->success_msg;
3017
+			$message = isset( $form->options[$opt . '_msg'] ) ? $form->options[$opt . '_msg'] : $frm_settings->success_msg;
3018 3018
 			$class   = 'frm_message';
3019 3019
 		} else {
3020 3020
 			$message = $frm_settings->failed_msg;
@@ -3237,8 +3237,8 @@  discard block
 block discarded – undo
3237 3237
 
3238 3238
 		check_ajax_referer( 'frm_ajax', 'nonce' );
3239 3239
 
3240
-		$html             = FrmAppHelper::clip(
3241
-			function () {
3240
+		$html = FrmAppHelper::clip(
3241
+			function() {
3242 3242
 				FrmAppHelper::maybe_autocomplete_pages_options(
3243 3243
 					array(
3244 3244
 						'field_name'  => 'frm_page_dropdown',
Please login to merge, or discard this patch.
classes/models/FrmFormMigrator.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
 
235 235
 			// This may occasionally skip one level/order e.g. after adding a
236 236
 			// list field, as field_order would already be prepared to be used.
237
-			++$field_order;
237
+			++ $field_order;
238 238
 
239 239
 			if ( ! empty( $new_field['fields'] ) && is_array( $new_field['fields'] ) ) {
240 240
 				// we have (inner) fields to merge
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
272 272
 
273 273
 		$order = 0;
274 274
 		foreach ( $fields as $field ) {
275
-			++$order;
275
+			++ $order;
276 276
 			$type     = $this->get_field_type( $field );
277 277
 			$new_type = $this->convert_field_type( $type, $field );
278 278
 			if ( ! in_array( $new_type, $with_end ) && $new_type !== 'break' ) {
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
 		$sub['name'] = __( 'Section Buttons', 'formidable' );
303 303
 		$subs        = array( $sub );
304 304
 		$this->insert_fields_in_array( $subs, $order, 0, $fields );
305
-		++$order;
305
+		++ $order;
306 306
 	}
307 307
 
308 308
 	/**
@@ -399,7 +399,7 @@  discard block
 block discarded – undo
399 399
 	protected function create_fields( $form_id, &$form ) {
400 400
 		foreach ( $form['fields'] as $key => $new_field ) {
401 401
 			$new_field['form_id']         = $form_id;
402
-			$form['fields'][ $key ]['id'] = FrmField::create( $new_field );
402
+			$form['fields'][$key]['id'] = FrmField::create( $new_field );
403 403
 		}
404 404
 	}
405 405
 
@@ -433,9 +433,9 @@  discard block
 block discarded – undo
433 433
 			} elseif ( $key === 'the_post_title' ) {
434 434
 				$new_action->post_content['post_title'] = $value;
435 435
 			} elseif ( is_string( $value ) ) {
436
-				$new_action->post_content[ $key ] = $this->replace_smart_tags( $value, $form['fields'] );
436
+				$new_action->post_content[$key] = $this->replace_smart_tags( $value, $form['fields'] );
437 437
 			} else {
438
-				$new_action->post_content[ $key ] = $value;
438
+				$new_action->post_content[$key] = $value;
439 439
 			}
440 440
 		}
441 441
 
@@ -454,7 +454,7 @@  discard block
 block discarded – undo
454 454
 
455 455
 		$imported = $this->get_tracked_import();
456 456
 
457
-		$imported[ $this->slug ][ $new_form_id ] = $source_id;
457
+		$imported[$this->slug][$new_form_id] = $source_id;
458 458
 
459 459
 		update_option( $this->tracking, $imported, false );
460 460
 	}
@@ -474,11 +474,11 @@  discard block
 block discarded – undo
474 474
 	private function is_imported( $source_id ) {
475 475
 		$imported    = $this->get_tracked_import();
476 476
 		$new_form_id = 0;
477
-		if ( ! isset( $imported[ $this->slug ] ) || ! in_array( $source_id, $imported[ $this->slug ] ) ) {
477
+		if ( ! isset( $imported[$this->slug] ) || ! in_array( $source_id, $imported[$this->slug] ) ) {
478 478
 			return $new_form_id;
479 479
 		}
480 480
 
481
-		$new_form_id = array_search( $source_id, array_reverse( $imported[ $this->slug ], true ) );
481
+		$new_form_id = array_search( $source_id, array_reverse( $imported[$this->slug], true ) );
482 482
 		if ( ! empty( $new_form_id ) && empty( FrmForm::get_key_by_id( $new_form_id ) ) ) {
483 483
 			// Allow reimport if the form was deleted.
484 484
 			$new_form_id = 0;
Please login to merge, or discard this patch.