Completed
Pull Request — master (#1356)
by Stephanie
59s
created
classes/views/solutions/_import.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 				$info['url'] = $xml;
12 12
 			}
13 13
 
14
-			$disabled = isset( $imported[ $info['form'] ] ) ? ' disabled' : '';
14
+			$disabled = isset( $imported[$info['form']] ) ? ' disabled' : '';
15 15
 			$url   = isset( $info['url'] ) ? $info['url'] : '';
16 16
 			$value = $importing === 'form' ? $info['form'] : $info['key'];
17 17
 			if ( ! isset( $info['img'] ) ) {
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 				continue;
22 22
 			}
23 23
 
24
-			$hide_views = $importing === 'view' && ( ( $selected && $info['form'] !== $selected ) || isset( $imported[ $info['form'] ] ) );
24
+			$hide_views = $importing === 'view' && ( ( $selected && $info['form'] !== $selected ) || isset( $imported[$info['form']] ) );
25 25
 			?>
26 26
 			<div class="frm_radio radio-inline radio frm_image_option<?php echo esc_attr( $importing === 'view' ? ' show_sub_opt show_' . $info['form'] : '' ); ?>" style="<?php echo esc_attr( $hide_views ? 'display:none' : '' ); ?>">
27 27
 				<?php if ( $importing === 'form' ) { ?>
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 					<?php } ?>
42 42
 					/>
43 43
 					<div class="frm_image_option_container frm_label_with_image">
44
-						<?php echo FrmAppHelper::kses( $info['img'], array( 'svg', 'rect', 'path' ) );  // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
44
+						<?php echo FrmAppHelper::kses( $info['img'], array( 'svg', 'rect', 'path' ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
45 45
 						<span class="frm_text_label_for_image">
46 46
 							<?php
47 47
 							if ( ! empty( $disabled ) ) {
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 							}
55 55
 
56 56
 							if ( $importing === 'form' && $disabled ) {
57
-								echo FrmAppHelper::kses( FrmFormsHelper::edit_form_link( $imported[ $info['form'] ] ), array( 'a' ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
57
+								echo FrmAppHelper::kses( FrmFormsHelper::edit_form_link( $imported[$info['form']] ), array( 'a' ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
58 58
 							} else {
59 59
 								echo esc_html( $info['name'] );
60 60
 							}
Please login to merge, or discard this patch.
deprecated/FrmDeprecated.php 2 patches
Indentation   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -749,8 +749,8 @@  discard block
 block discarded – undo
749 749
 	 */
750 750
 	public static function get_shortcode_tag( $shortcodes, $short_key, $args ) {
751 751
 		_deprecated_function( __FUNCTION__, '3.0', 'FrmShortcodeHelper::get_shortcode_tag' );
752
-        return FrmShortcodeHelper::get_shortcode_tag( $shortcodes, $short_key, $args );
753
-    }
752
+		return FrmShortcodeHelper::get_shortcode_tag( $shortcodes, $short_key, $args );
753
+	}
754 754
 
755 755
 	/**
756 756
 	 * @deprecated 3.01
@@ -763,52 +763,52 @@  discard block
 block discarded – undo
763 763
 	/**
764 764
 	 * @deprecated 3.02.03
765 765
 	 */
766
-    public static function jquery_themes() {
766
+	public static function jquery_themes() {
767 767
 		_deprecated_function( __FUNCTION__, '3.02.03', 'FrmProStylesController::jquery_themes' );
768 768
 
769
-        $themes = array(
770
-            'ui-lightness'  => 'UI Lightness',
771
-            'ui-darkness'   => 'UI Darkness',
772
-            'smoothness'    => 'Smoothness',
773
-            'start'         => 'Start',
774
-            'redmond'       => 'Redmond',
775
-            'sunny'         => 'Sunny',
776
-            'overcast'      => 'Overcast',
777
-            'le-frog'       => 'Le Frog',
778
-            'flick'         => 'Flick',
769
+		$themes = array(
770
+			'ui-lightness'  => 'UI Lightness',
771
+			'ui-darkness'   => 'UI Darkness',
772
+			'smoothness'    => 'Smoothness',
773
+			'start'         => 'Start',
774
+			'redmond'       => 'Redmond',
775
+			'sunny'         => 'Sunny',
776
+			'overcast'      => 'Overcast',
777
+			'le-frog'       => 'Le Frog',
778
+			'flick'         => 'Flick',
779 779
 			'pepper-grinder' => 'Pepper Grinder',
780
-            'eggplant'      => 'Eggplant',
781
-            'dark-hive'     => 'Dark Hive',
782
-            'cupertino'     => 'Cupertino',
783
-            'south-street'  => 'South Street',
784
-            'blitzer'       => 'Blitzer',
785
-            'humanity'      => 'Humanity',
786
-            'hot-sneaks'    => 'Hot Sneaks',
787
-            'excite-bike'   => 'Excite Bike',
788
-            'vader'         => 'Vader',
789
-            'dot-luv'       => 'Dot Luv',
790
-            'mint-choc'     => 'Mint Choc',
791
-            'black-tie'     => 'Black Tie',
792
-            'trontastic'    => 'Trontastic',
793
-            'swanky-purse'  => 'Swanky Purse',
794
-        );
780
+			'eggplant'      => 'Eggplant',
781
+			'dark-hive'     => 'Dark Hive',
782
+			'cupertino'     => 'Cupertino',
783
+			'south-street'  => 'South Street',
784
+			'blitzer'       => 'Blitzer',
785
+			'humanity'      => 'Humanity',
786
+			'hot-sneaks'    => 'Hot Sneaks',
787
+			'excite-bike'   => 'Excite Bike',
788
+			'vader'         => 'Vader',
789
+			'dot-luv'       => 'Dot Luv',
790
+			'mint-choc'     => 'Mint Choc',
791
+			'black-tie'     => 'Black Tie',
792
+			'trontastic'    => 'Trontastic',
793
+			'swanky-purse'  => 'Swanky Purse',
794
+		);
795 795
 
796 796
 		$themes = apply_filters( 'frm_jquery_themes', $themes );
797
-        return $themes;
798
-    }
797
+		return $themes;
798
+	}
799 799
 
800 800
 	/**
801 801
 	 * @deprecated 3.02.03
802 802
 	 */
803
-    public static function enqueue_jquery_css() {
803
+	public static function enqueue_jquery_css() {
804 804
 		_deprecated_function( __FUNCTION__, '3.02.03', 'FrmProStylesController::enqueue_jquery_css' );
805 805
 
806 806
 		$form = self::get_form_for_page();
807 807
 		$theme_css = FrmStylesController::get_style_val( 'theme_css', $form );
808
-        if ( $theme_css != -1 ) {
808
+		if ( $theme_css != -1 ) {
809 809
 			wp_enqueue_style( 'jquery-theme', self::jquery_css_url( $theme_css ), array(), FrmAppHelper::plugin_version() );
810
-        }
811
-    }
810
+		}
811
+	}
812 812
 
813 813
 	/**
814 814
 	 * @deprecated 3.02.03
@@ -821,7 +821,7 @@  discard block
 block discarded – undo
821 821
 		}
822 822
 
823 823
 		return FrmProStylesController::jquery_css_url( $theme_css );
824
-    }
824
+	}
825 825
 
826 826
 	/**
827 827
 	 * @deprecated 3.02.03
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 		FrmAppHelper::permission_check( 'frm_edit_forms' );
28 28
 
29 29
 		$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
30
-		$action = empty( $values ) ? FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' ) : $values[ $action ];
30
+		$action = empty( $values ) ? FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' ) : $values[$action];
31 31
 
32 32
 		if ( $action === 'create' ) {
33 33
 			FrmFormsController::update( $values );
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 		}
36 36
 
37 37
 		$values = FrmFormsHelper::setup_new_vars( $values );
38
-		$id   = FrmForm::create( $values );
38
+		$id = FrmForm::create( $values );
39 39
 		$values['id'] = $id;
40 40
 
41 41
 		FrmFormsController::edit( $values );
Please login to merge, or discard this patch.
classes/views/frm-fields/back-end/html-content.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
 				'title'     => esc_attr__( 'Toggle Options', 'formidable' ),
17 17
 			)
18 18
 		);
19
-		$e_args  = array(
19
+		$e_args = array(
20 20
 			'textarea_name' => 'field_options[description_' . absint( $field['id'] ) . ']',
21 21
 			'textarea_rows' => 8,
22 22
 		);
Please login to merge, or discard this patch.
classes/views/frm-forms/landing-page-preview-option.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@
 block discarded – undo
6 6
 $data_keys = array_keys( $data );
7 7
 $params    = array();
8 8
 foreach ( $data_keys as $key ) {
9
-	$params[ 'data-' . $key ] = $data[ $key ];
9
+	$params['data-' . $key] = $data[$key];
10 10
 }
11 11
 $params['class'] = 'frm_show_upgrade frm_noallow';
12 12
 $params['href']  = '#';
Please login to merge, or discard this patch.
classes/models/FrmEntryValidate.php 2 patches
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 			return $errors;
15 15
 		}
16 16
 
17
-		if ( FrmAppHelper::is_admin() && is_user_logged_in() && ( ! isset( $values[ 'frm_submit_entry_' . $values['form_id'] ] ) || ! wp_verify_nonce( $values[ 'frm_submit_entry_' . $values['form_id'] ], 'frm_submit_entry_nonce' ) ) ) {
17
+		if ( FrmAppHelper::is_admin() && is_user_logged_in() && ( ! isset( $values['frm_submit_entry_' . $values['form_id']] ) || ! wp_verify_nonce( $values['frm_submit_entry_' . $values['form_id']], 'frm_submit_entry_nonce' ) ) ) {
18 18
 			$frm_settings   = FrmAppHelper::get_settings();
19 19
 			$errors['form'] = $frm_settings->admin_permission;
20 20
 		}
@@ -88,10 +88,10 @@  discard block
 block discarded – undo
88 88
 			'key_pointer'     => '', // the pointer in the posted array
89 89
 			'exclude'         => array(), // exclude these field types from validation
90 90
 		);
91
-		$args     = wp_parse_args( $args, $defaults );
91
+		$args = wp_parse_args( $args, $defaults );
92 92
 
93 93
 		if ( empty( $args['parent_field_id'] ) ) {
94
-			$value = isset( $values['item_meta'][ $args['id'] ] ) ? $values['item_meta'][ $args['id'] ] : '';
94
+			$value = isset( $values['item_meta'][$args['id']] ) ? $values['item_meta'][$args['id']] : '';
95 95
 		} else {
96 96
 			// value is from a nested form
97 97
 			$value = $values;
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 		}
113 113
 
114 114
 		if ( $posted_field->required == '1' && FrmAppHelper::is_empty_value( $value ) ) {
115
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $posted_field, 'blank' );
115
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $posted_field, 'blank' );
116 116
 		} elseif ( ! isset( $_POST['item_name'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
117 117
 			self::maybe_add_item_name( $value, $posted_field );
118 118
 		}
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 			$pattern = self::phone_format( $field );
189 189
 
190 190
 			if ( ! preg_match( $pattern, $value ) ) {
191
-				$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
191
+				$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
192 192
 			}
193 193
 		}
194 194
 	}
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
298 298
 	 */
299 299
 	private static function form_is_in_progress( $values ) {
300 300
 		return FrmAppHelper::pro_is_installed() &&
301
-			( isset( $values[ 'frm_page_order_' . $values['form_id'] ] ) || FrmAppHelper::get_post_param( 'frm_next_page' ) ) &&
301
+			( isset( $values['frm_page_order_' . $values['form_id']] ) || FrmAppHelper::get_post_param( 'frm_next_page' ) ) &&
302 302
 			FrmField::get_all_types_in_form( $values['form_id'], 'break' );
303 303
 	}
304 304
 
@@ -543,9 +543,9 @@  discard block
 block discarded – undo
543 543
 			foreach ( $datas['missing_keys'] as $key_index => $key ) {
544 544
 				$found = self::is_akismet_guest_info_value( $key, $value, $field_id, $datas['name_field_ids'] );
545 545
 				if ( $found ) {
546
-					$datas[ $key ]             = $value;
546
+					$datas[$key]             = $value;
547 547
 					$datas['frm_duplicated'][] = $field_id;
548
-					unset( $datas['missing_keys'][ $key_index ] );
548
+					unset( $datas['missing_keys'][$key_index] );
549 549
 				}
550 550
 			}
551 551
 		}
@@ -591,7 +591,7 @@  discard block
 block discarded – undo
591 591
 
592 592
 			// Send any potentially useful $_SERVER vars, but avoid sending junk we don't need.
593 593
 			if ( $include_value ) {
594
-				$datas[ $key ] = $value;
594
+				$datas[$key] = $value;
595 595
 			}
596 596
 			unset( $key, $value );
597 597
 		}
@@ -608,10 +608,10 @@  discard block
 block discarded – undo
608 608
 	private static function add_comment_content_to_akismet( &$datas, $values ) {
609 609
 		if ( isset( $datas['frm_duplicated'] ) ) {
610 610
 			foreach ( $datas['frm_duplicated'] as $index ) {
611
-				if ( isset( $values['item_meta'][ $index ] ) ) {
612
-					unset( $values['item_meta'][ $index ] );
611
+				if ( isset( $values['item_meta'][$index] ) ) {
612
+					unset( $values['item_meta'][$index] );
613 613
 				} else {
614
-					unset( $values[ $index ] );
614
+					unset( $values[$index] );
615 615
 				}
616 616
 			}
617 617
 			unset( $datas['frm_duplicated'] );
@@ -632,14 +632,14 @@  discard block
 block discarded – undo
632 632
 	private static function skip_adding_values_to_akismet( &$values ) {
633 633
 		$skipped_fields = self::get_akismet_skipped_field_ids( $values );
634 634
 		foreach ( $skipped_fields as $skipped_field ) {
635
-			if ( ! isset( $values['item_meta'][ $skipped_field->id ] ) ) {
635
+			if ( ! isset( $values['item_meta'][$skipped_field->id] ) ) {
636 636
 				continue;
637 637
 			}
638 638
 
639 639
 			if ( self::should_really_skip_field( $skipped_field, $values ) ) {
640
-				unset( $values['item_meta'][ $skipped_field->id ] );
641
-				if ( isset( $values['item_meta']['other'][ $skipped_field->id ] ) ) {
642
-					unset( $values['item_meta']['other'][ $skipped_field->id ] );
640
+				unset( $values['item_meta'][$skipped_field->id] );
641
+				if ( isset( $values['item_meta']['other'][$skipped_field->id] ) ) {
642
+					unset( $values['item_meta']['other'][$skipped_field->id] );
643 643
 				}
644 644
 			}
645 645
 		}
@@ -672,14 +672,14 @@  discard block
 block discarded – undo
672 672
 		}
673 673
 
674 674
 		// If a choice field has Other option, but Other is not selected.
675
-		if ( empty( $values['item_meta']['other'][ $field_data->id ] ) ) {
675
+		if ( empty( $values['item_meta']['other'][$field_data->id] ) ) {
676 676
 			return true;
677 677
 		}
678 678
 
679 679
 		// Check if submitted value is same as one of field option.
680 680
 		foreach ( $field_data->options as $option ) {
681 681
 			$option_value = ! is_array( $option ) ? $option : ( isset( $option['value'] ) ? $option['value'] : '' );
682
-			if ( $values['item_meta']['other'][ $field_data->id ] === $option_value ) {
682
+			if ( $values['item_meta']['other'][$field_data->id] === $option_value ) {
683 683
 				return true;
684 684
 			}
685 685
 		}
@@ -749,7 +749,7 @@  discard block
 block discarded – undo
749 749
 
750 750
 			// Convert name array to string.
751 751
 			if ( isset( $value['first'] ) && isset( $value['last'] ) ) {
752
-				$values['item_meta'][ $field_id ] = trim( implode( ' ', $value ) );
752
+				$values['item_meta'][$field_id] = trim( implode( ' ', $value ) );
753 753
 				$values['name_field_ids'][]       = $field_id;
754 754
 				continue;
755 755
 			}
@@ -770,8 +770,8 @@  discard block
 block discarded – undo
770 770
 						continue;
771 771
 					}
772 772
 
773
-					if ( ! isset( $values['item_meta'][ $subsubindex ] ) ) {
774
-						$values['item_meta'][ $subsubindex ] = array();
773
+					if ( ! isset( $values['item_meta'][$subsubindex] ) ) {
774
+						$values['item_meta'][$subsubindex] = array();
775 775
 					}
776 776
 
777 777
 					// Convert name array to string.
@@ -781,11 +781,11 @@  discard block
 block discarded – undo
781 781
 						$values['name_field_ids'][] = $subsubindex;
782 782
 					}
783 783
 
784
-					$values['item_meta'][ $subsubindex ][] = $subsubvalue;
784
+					$values['item_meta'][$subsubindex][] = $subsubvalue;
785 785
 				}
786 786
 			}
787 787
 
788
-			unset( $values['item_meta'][ $field_id ] );
788
+			unset( $values['item_meta'][$field_id] );
789 789
 		}
790 790
 
791 791
 		return $form_ids;
Please login to merge, or discard this patch.
Braces   +8 added lines, -4 removed lines patch added patch discarded remove patch
@@ -113,7 +113,8 @@  discard block
 block discarded – undo
113 113
 
114 114
 		if ( $posted_field->required == '1' && FrmAppHelper::is_empty_value( $value ) ) {
115 115
 			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $posted_field, 'blank' );
116
-		} elseif ( ! isset( $_POST['item_name'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
116
+		} elseif ( ! isset( $_POST['item_name'] ) ) {
117
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
117 118
 			self::maybe_add_item_name( $value, $posted_field );
118 119
 		}
119 120
 
@@ -655,12 +656,14 @@  discard block
 block discarded – undo
655 656
 	 * @return bool
656 657
 	 */
657 658
 	private static function should_really_skip_field( $field_data, $values ) {
658
-		if ( empty( $field_data->options ) ) { // This is skipped field types.
659
+		if ( empty( $field_data->options ) ) {
660
+// This is skipped field types.
659 661
 			return true;
660 662
 		}
661 663
 
662 664
 		FrmAppHelper::unserialize_or_decode( $field_data->options );
663
-		if ( ! $field_data->options ) { // Check if an error happens when unserializing, or empty options.
665
+		if ( ! $field_data->options ) {
666
+// Check if an error happens when unserializing, or empty options.
664 667
 			return true;
665 668
 		}
666 669
 
@@ -743,7 +746,8 @@  discard block
 block discarded – undo
743 746
 		// Blacklist check for File field in the old version doesn't contain `form_id`.
744 747
 		$form_ids = isset( $values['form_id'] ) ? array( absint( $values['form_id'] ) ) : array();
745 748
 		foreach ( $values['item_meta'] as $field_id => $value ) {
746
-			if ( ! is_numeric( $field_id ) ) { // Maybe `other`.
749
+			if ( ! is_numeric( $field_id ) ) {
750
+// Maybe `other`.
747 751
 				continue;
748 752
 			}
749 753
 
Please login to merge, or discard this patch.
classes/models/FrmFieldFormHtml.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
45 45
 	 * @param array $atts
46 46
 	 */
47 47
 	private function _set( $param, $atts ) {
48
-		if ( isset( $atts[ $param ] ) ) {
49
-			$this->{$param} = $atts[ $param ];
48
+		if ( isset( $atts[$param] ) ) {
49
+			$this->{$param} = $atts[$param];
50 50
 		}
51 51
 	}
52 52
 
@@ -90,8 +90,8 @@  discard block
 block discarded – undo
90 90
 
91 91
 		$exclude = array( 'field_obj', 'html' );
92 92
 		foreach ( $exclude as $ex ) {
93
-			if ( isset( $atts[ $ex ] ) ) {
94
-				unset( $this->pass_args[ $ex ] );
93
+			if ( isset( $atts[$ex] ) ) {
94
+				unset( $this->pass_args[$ex] );
95 95
 			}
96 96
 		}
97 97
 	}
@@ -103,8 +103,8 @@  discard block
 block discarded – undo
103 103
 	 * @param array $set
104 104
 	 */
105 105
 	private function set_from_field( $atts, $set ) {
106
-		if ( isset( $atts[ $set['param'] ] ) ) {
107
-			$this->{$set['param']} = $atts[ $set['param'] ];
106
+		if ( isset( $atts[$set['param']] ) ) {
107
+			$this->{$set['param']} = $atts[$set['param']];
108 108
 		} else {
109 109
 			$this->{$set['param']} = $this->field_obj->get_field_column( $set['default'] );
110 110
 		}
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
 	 */
230 230
 	private function replace_error_shortcode() {
231 231
 		$this->maybe_add_error_id();
232
-		$error = isset( $this->pass_args['errors'][ 'field' . $this->field_id ] ) ? $this->pass_args['errors'][ 'field' . $this->field_id ] : false;
232
+		$error = isset( $this->pass_args['errors']['field' . $this->field_id] ) ? $this->pass_args['errors']['field' . $this->field_id] : false;
233 233
 
234 234
 		if ( ! empty( $error ) && false === strpos( $this->html, 'role="alert"' ) && FrmAppHelper::should_include_alert_role_on_field_errors() ) {
235 235
 			$error_body = self::get_error_body( $this->html );
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
 	 * @since 3.06.02
271 271
 	 */
272 272
 	private function maybe_add_error_id() {
273
-		if ( ! isset( $this->pass_args['errors'][ 'field' . $this->field_id ] ) ) {
273
+		if ( ! isset( $this->pass_args['errors']['field' . $this->field_id] ) ) {
274 274
 			return;
275 275
 		}
276 276
 
@@ -350,7 +350,7 @@  discard block
 block discarded – undo
350 350
 		preg_match_all( "/\[(input|deletelink)\b(.*?)(?:(\/))?\]/s", $this->html, $shortcodes, PREG_PATTERN_ORDER );
351 351
 
352 352
 		foreach ( $shortcodes[0] as $short_key => $tag ) {
353
-			$shortcode_atts = FrmShortcodeHelper::get_shortcode_attribute_array( $shortcodes[2][ $short_key ] );
353
+			$shortcode_atts = FrmShortcodeHelper::get_shortcode_attribute_array( $shortcodes[2][$short_key] );
354 354
 			$tag            = FrmShortcodeHelper::get_shortcode_tag( $shortcodes, $short_key );
355 355
 
356 356
 			$replace_with = '';
@@ -361,7 +361,7 @@  discard block
 block discarded – undo
361 361
 				$replace_with = $this->replace_input_shortcode( $shortcode_atts );
362 362
 			}
363 363
 
364
-			$this->html = str_replace( $shortcodes[0][ $short_key ], $replace_with, $this->html );
364
+			$this->html = str_replace( $shortcodes[0][$short_key], $replace_with, $this->html );
365 365
 		}
366 366
 	}
367 367
 
@@ -393,7 +393,7 @@  discard block
 block discarded – undo
393 393
 			unset( $shortcode_atts['class'] );
394 394
 		}
395 395
 
396
-		$shortcode_atts['aria-invalid'] = isset( $this->pass_args['errors'][ 'field' . $this->field_id ] ) ? 'true' : 'false';
396
+		$shortcode_atts['aria-invalid'] = isset( $this->pass_args['errors']['field' . $this->field_id] ) ? 'true' : 'false';
397 397
 
398 398
 		$this->field_obj->set_field_column( 'shortcodes', $shortcode_atts );
399 399
 
@@ -448,7 +448,7 @@  discard block
 block discarded – undo
448 448
 	 */
449 449
 	private function get_field_div_classes() {
450 450
 		// Add error class
451
-		$classes = isset( $this->pass_args['errors'][ 'field' . $this->field_id ] ) ? ' frm_blank_field' : '';
451
+		$classes = isset( $this->pass_args['errors']['field' . $this->field_id] ) ? ' frm_blank_field' : '';
452 452
 
453 453
 		// Add label position class
454 454
 		$settings = $this->field_obj->display_field_settings();
Please login to merge, or discard this patch.
classes/helpers/FrmXMLHelper.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -87,7 +87,8 @@
 block discarded – undo
87 87
 
88 88
 		if ( ! isset( $imported['form_status'] ) || empty( $imported['form_status'] ) ) {
89 89
 			// Check for an error message in the XML.
90
-			if ( isset( $xml->Code ) && isset( $xml->Message ) ) { // phpcs:ignore WordPress.NamingConventions
90
+			if ( isset( $xml->Code ) && isset( $xml->Message ) ) {
91
+// phpcs:ignore WordPress.NamingConventions
91 92
 				$imported['error'] = (string) $xml->Message; // phpcs:ignore WordPress.NamingConventions
92 93
 			}
93 94
 		}
Please login to merge, or discard this patch.
Spacing   +84 added lines, -84 removed lines patch added patch discarded remove patch
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
 
141 141
 			if ( $term && is_array( $term ) ) {
142 142
 				$imported['imported']['terms'] ++;
143
-				$imported['terms'][ (int) $t->term_id ] = $term['term_id'];
143
+				$imported['terms'][(int) $t->term_id] = $term['term_id'];
144 144
 			}
145 145
 
146 146
 			unset( $term, $t );
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
 					}
197 197
 
198 198
 					// Keep track of whether this specific form was updated or not.
199
-					$imported['form_status'][ $form_id ] = 'imported';
199
+					$imported['form_status'][$form_id] = 'imported';
200 200
 				}
201 201
 			}
202 202
 
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
 			// Update field ids/keys to new ones.
212 212
 			do_action( 'frm_after_duplicate_form', $form_id, $form, array( 'old_id' => $old_id ) );
213 213
 
214
-			$imported['forms'][ (int) $item->id ] = $form_id;
214
+			$imported['forms'][(int) $item->id] = $form_id;
215 215
 
216 216
 			// Send pre 2.0 form options through function that creates actions.
217 217
 			self::migrate_form_settings_to_actions( $form['options'], $form_id, $imported, true );
@@ -279,15 +279,15 @@  discard block
 block discarded – undo
279 279
 		}
280 280
 
281 281
 		// Keep track of whether this specific form was updated or not
282
-		$imported['form_status'][ $form_id ] = 'updated';
282
+		$imported['form_status'][$form_id] = 'updated';
283 283
 	}
284 284
 
285 285
 	private static function get_form_fields( $form_id ) {
286 286
 		$form_fields = FrmField::get_all_for_form( $form_id, '', 'exclude', 'exclude' );
287 287
 		$old_fields  = array();
288 288
 		foreach ( $form_fields as $f ) {
289
-			$old_fields[ $f->id ]        = $f;
290
-			$old_fields[ $f->field_key ] = $f->id;
289
+			$old_fields[$f->id]        = $f;
290
+			$old_fields[$f->field_key] = $f->id;
291 291
 			unset( $f );
292 292
 		}
293 293
 		$form_fields = $old_fields;
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
344 344
 	 */
345 345
 	private static function track_imported_child_forms( $form_id, $parent_form_id, &$child_forms ) {
346 346
 		if ( $parent_form_id ) {
347
-			$child_forms[ $form_id ] = $parent_form_id;
347
+			$child_forms[$form_id] = $parent_form_id;
348 348
 		}
349 349
 	}
350 350
 
@@ -359,9 +359,9 @@  discard block
 block discarded – undo
359 359
 	 */
360 360
 	private static function maybe_update_child_form_parent_id( $imported_forms, $child_forms ) {
361 361
 		foreach ( $child_forms as $child_form_id => $old_parent_form_id ) {
362
-			if ( isset( $imported_forms[ $old_parent_form_id ] ) && (int) $imported_forms[ $old_parent_form_id ] !== (int) $old_parent_form_id ) {
362
+			if ( isset( $imported_forms[$old_parent_form_id] ) && (int) $imported_forms[$old_parent_form_id] !== (int) $old_parent_form_id ) {
363 363
 				// Update all children with this old parent_form_id
364
-				$new_parent_form_id = (int) $imported_forms[ $old_parent_form_id ];
364
+				$new_parent_form_id = (int) $imported_forms[$old_parent_form_id];
365 365
 				FrmForm::update( $child_form_id, array( 'parent_form_id' => $new_parent_form_id ) );
366 366
 				do_action( 'frm_update_child_form_parent_id', $child_form_id, $new_parent_form_id );
367 367
 			}
@@ -391,27 +391,27 @@  discard block
 block discarded – undo
391 391
 
392 392
 			if ( ! empty( $this_form ) ) {
393 393
 				// check for field to edit by field id
394
-				if ( isset( $form_fields[ $f['id'] ] ) ) {
394
+				if ( isset( $form_fields[$f['id']] ) ) {
395 395
 					FrmField::update( $f['id'], $f );
396 396
 					$imported['updated']['fields'] ++;
397 397
 
398
-					unset( $form_fields[ $f['id'] ] );
398
+					unset( $form_fields[$f['id']] );
399 399
 
400 400
 					//unset old field key
401
-					if ( isset( $form_fields[ $f['field_key'] ] ) ) {
402
-						unset( $form_fields[ $f['field_key'] ] );
401
+					if ( isset( $form_fields[$f['field_key']] ) ) {
402
+						unset( $form_fields[$f['field_key']] );
403 403
 					}
404
-				} elseif ( isset( $form_fields[ $f['field_key'] ] ) ) {
405
-					$keys_by_original_field_id[ $f['id'] ] = $f['field_key'];
404
+				} elseif ( isset( $form_fields[$f['field_key']] ) ) {
405
+					$keys_by_original_field_id[$f['id']] = $f['field_key'];
406 406
 
407 407
 					// check for field to edit by field key
408 408
 					unset( $f['id'] );
409 409
 
410
-					FrmField::update( $form_fields[ $f['field_key'] ], $f );
410
+					FrmField::update( $form_fields[$f['field_key']], $f );
411 411
 					$imported['updated']['fields'] ++;
412 412
 
413
-					unset( $form_fields[ $form_fields[ $f['field_key'] ] ] ); //unset old field id
414
-					unset( $form_fields[ $f['field_key'] ] ); //unset old field key
413
+					unset( $form_fields[$form_fields[$f['field_key']]] ); //unset old field id
414
+					unset( $form_fields[$f['field_key']] ); //unset old field key
415 415
 				} else {
416 416
 					// if no matching field id or key in this form, create the field
417 417
 					self::create_imported_field( $f, $imported );
@@ -520,8 +520,8 @@  discard block
 block discarded – undo
520 520
 		if ( $f['type'] == 'form' || ( $f['type'] == 'divider' && FrmField::is_option_true( $f['field_options'], 'repeat' ) ) ) {
521 521
 			if ( FrmField::is_option_true( $f['field_options'], 'form_select' ) ) {
522 522
 				$form_select = (int) $f['field_options']['form_select'];
523
-				if ( isset( $imported['forms'][ $form_select ] ) ) {
524
-					$f['field_options']['form_select'] = $imported['forms'][ $form_select ];
523
+				if ( isset( $imported['forms'][$form_select] ) ) {
524
+					$f['field_options']['form_select'] = $imported['forms'][$form_select];
525 525
 				}
526 526
 			}
527 527
 		}
@@ -542,8 +542,8 @@  discard block
 block discarded – undo
542 542
 
543 543
 		if ( FrmField::is_option_true_in_array( $f['field_options'], 'get_values_form' ) ) {
544 544
 			$old_form = $f['field_options']['get_values_form'];
545
-			if ( isset( $imported['forms'][ $old_form ] ) ) {
546
-				$f['field_options']['get_values_form'] = $imported['forms'][ $old_form ];
545
+			if ( isset( $imported['forms'][$old_form] ) ) {
546
+				$f['field_options']['get_values_form'] = $imported['forms'][$old_form];
547 547
 			}
548 548
 		}
549 549
 	}
@@ -564,12 +564,12 @@  discard block
 block discarded – undo
564 564
 	private static function migrate_placeholders( &$f ) {
565 565
 		$update_values = self::migrate_field_placeholder( $f, 'clear_on_focus' );
566 566
 		foreach ( $update_values as $k => $v ) {
567
-			$f[ $k ] = $v;
567
+			$f[$k] = $v;
568 568
 		}
569 569
 
570 570
 		$update_values = self::migrate_field_placeholder( $f, 'default_blank' );
571 571
 		foreach ( $update_values as $k => $v ) {
572
-			$f[ $k ] = $v;
572
+			$f[$k] = $v;
573 573
 		}
574 574
 	}
575 575
 
@@ -583,7 +583,7 @@  discard block
 block discarded – undo
583 583
 	public static function migrate_field_placeholder( $field, $type ) {
584 584
 		$field = (array) $field;
585 585
 		$field_options = $field['field_options'];
586
-		if ( empty( $field_options[ $type ] ) || empty( $field['default_value'] ) ) {
586
+		if ( empty( $field_options[$type] ) || empty( $field['default_value'] ) ) {
587 587
 			return array();
588 588
 		}
589 589
 
@@ -609,7 +609,7 @@  discard block
 block discarded – undo
609 609
 				}
610 610
 
611 611
 				if ( $opt == $default_value ) {
612
-					unset( $options[ $opt_key ] );
612
+					unset( $options[$opt_key] );
613 613
 					break;
614 614
 				}
615 615
 			}
@@ -664,10 +664,10 @@  discard block
 block discarded – undo
664 664
 			$field_object->type = 'file'; // Fake the file type as FrmProImport::import_attachment checks for file type.
665 665
 
666 666
 			$image_id = FrmProFileImport::import_attachment( $option['src'], $field_object );
667
-			unset( $field['options'][ $key ]['src'] ); // Remove the src from options as it isn't required after import.
667
+			unset( $field['options'][$key]['src'] ); // Remove the src from options as it isn't required after import.
668 668
 
669 669
 			if ( is_numeric( $image_id ) ) {
670
-				$field['options'][ $key ]['image'] = $image_id;
670
+				$field['options'][$key]['image'] = $image_id;
671 671
 			}
672 672
 		}
673 673
 
@@ -837,8 +837,8 @@  discard block
 block discarded – undo
837 837
 			} else {
838 838
 				if ( $post['post_type'] === 'frm_display' ) {
839 839
 					$post['post_content'] = self::maybe_prepare_json_view_content( $post['post_content'] );
840
-				} elseif ( 'page' === $post['post_type'] && isset( $imported['posts'][ $post['post_parent'] ] ) ) {
841
-					$post['post_parent'] = $imported['posts'][ $post['post_parent'] ];
840
+				} elseif ( 'page' === $post['post_type'] && isset( $imported['posts'][$post['post_parent']] ) ) {
841
+					$post['post_parent'] = $imported['posts'][$post['post_parent']];
842 842
 				}
843 843
 				// Create/update post now
844 844
 				$post_id = wp_insert_post( $post );
@@ -849,27 +849,27 @@  discard block
 block discarded – undo
849 849
 			}
850 850
 
851 851
 			if ( false !== strpos( $post['post_content'], '[display-frm-data' ) || false !== strpos( $post['post_content'], '[formidable' ) ) {
852
-				$posts_with_shortcodes[ $post_id ] = $post;
852
+				$posts_with_shortcodes[$post_id] = $post;
853 853
 			}
854 854
 
855 855
 			self::update_postmeta( $post, $post_id );
856 856
 			self::update_layout( $post, $post_id );
857 857
 
858 858
 			$this_type = 'posts';
859
-			if ( isset( $post_types[ $post['post_type'] ] ) ) {
860
-				$this_type = $post_types[ $post['post_type'] ];
859
+			if ( isset( $post_types[$post['post_type']] ) ) {
860
+				$this_type = $post_types[$post['post_type']];
861 861
 			}
862 862
 
863 863
 			if ( isset( $post['ID'] ) && $post_id == $post['ID'] ) {
864
-				$imported['updated'][ $this_type ] ++;
864
+				$imported['updated'][$this_type] ++;
865 865
 			} else {
866
-				$imported['imported'][ $this_type ] ++;
866
+				$imported['imported'][$this_type] ++;
867 867
 			}
868 868
 
869
-			$imported['posts'][ (int) $old_id ] = $post_id;
869
+			$imported['posts'][(int) $old_id] = $post_id;
870 870
 
871 871
 			if ( $post['post_type'] === 'frm_display' ) {
872
-				$view_ids[ (int) $old_id ] = $post_id;
872
+				$view_ids[(int) $old_id] = $post_id;
873 873
 			}
874 874
 
875 875
 			do_action( 'frm_after_import_view', $post_id, $post );
@@ -996,9 +996,9 @@  discard block
 block discarded – undo
996 996
 			$post['attachment_url'] = (string) $item->attachment_url;
997 997
 		}
998 998
 
999
-		if ( $post['post_type'] == FrmFormActionsController::$action_post_type && isset( $imported['forms'][ (int) $post['menu_order'] ] ) ) {
999
+		if ( $post['post_type'] == FrmFormActionsController::$action_post_type && isset( $imported['forms'][(int) $post['menu_order']] ) ) {
1000 1000
 			// update to new form id
1001
-			$post['menu_order'] = $imported['forms'][ (int) $post['menu_order'] ];
1001
+			$post['menu_order'] = $imported['forms'][(int) $post['menu_order']];
1002 1002
 		}
1003 1003
 
1004 1004
 		// Don't allow default styles to take over a site's default style
@@ -1035,8 +1035,8 @@  discard block
 block discarded – undo
1035 1035
 		);
1036 1036
 
1037 1037
 		//switch old form and field ids to new ones
1038
-		if ( 'frm_form_id' === $m['key'] && isset( $imported['forms'][ (int) $m['value'] ] ) ) {
1039
-			$m['value'] = $imported['forms'][ (int) $m['value'] ];
1038
+		if ( 'frm_form_id' === $m['key'] && isset( $imported['forms'][(int) $m['value']] ) ) {
1039
+			$m['value'] = $imported['forms'][(int) $m['value']];
1040 1040
 		} else {
1041 1041
 			$m['value'] = FrmAppHelper::maybe_json_decode( $m['value'] );
1042 1042
 
@@ -1047,15 +1047,15 @@  discard block
 block discarded – undo
1047 1047
 				} elseif ( 'frm_options' === $m['key'] ) {
1048 1048
 
1049 1049
 					foreach ( array( 'date_field_id', 'edate_field_id' ) as $setting_name ) {
1050
-						if ( isset( $m['value'][ $setting_name ] ) && is_numeric( $m['value'][ $setting_name ] ) && isset( $frm_duplicate_ids[ $m['value'][ $setting_name ] ] ) ) {
1051
-							$m['value'][ $setting_name ] = $frm_duplicate_ids[ $m['value'][ $setting_name ] ];
1050
+						if ( isset( $m['value'][$setting_name] ) && is_numeric( $m['value'][$setting_name] ) && isset( $frm_duplicate_ids[$m['value'][$setting_name]] ) ) {
1051
+							$m['value'][$setting_name] = $frm_duplicate_ids[$m['value'][$setting_name]];
1052 1052
 						}
1053 1053
 					}
1054 1054
 
1055 1055
 					$check_dup_array = array();
1056 1056
 					if ( isset( $m['value']['order_by'] ) && ! empty( $m['value']['order_by'] ) ) {
1057
-						if ( is_numeric( $m['value']['order_by'] ) && isset( $frm_duplicate_ids[ $m['value']['order_by'] ] ) ) {
1058
-							$m['value']['order_by'] = $frm_duplicate_ids[ $m['value']['order_by'] ];
1057
+						if ( is_numeric( $m['value']['order_by'] ) && isset( $frm_duplicate_ids[$m['value']['order_by']] ) ) {
1058
+							$m['value']['order_by'] = $frm_duplicate_ids[$m['value']['order_by']];
1059 1059
 						} elseif ( is_array( $m['value']['order_by'] ) ) {
1060 1060
 							$check_dup_array[] = 'order_by';
1061 1061
 						}
@@ -1066,9 +1066,9 @@  discard block
 block discarded – undo
1066 1066
 					}
1067 1067
 
1068 1068
 					foreach ( $check_dup_array as $check_k ) {
1069
-						foreach ( (array) $m['value'][ $check_k ] as $mk => $mv ) {
1070
-							if ( isset( $frm_duplicate_ids[ $mv ] ) ) {
1071
-								$m['value'][ $check_k ][ $mk ] = $frm_duplicate_ids[ $mv ];
1069
+						foreach ( (array) $m['value'][$check_k] as $mk => $mv ) {
1070
+							if ( isset( $frm_duplicate_ids[$mv] ) ) {
1071
+								$m['value'][$check_k][$mk] = $frm_duplicate_ids[$mv];
1072 1072
 							}
1073 1073
 							unset( $mk, $mv );
1074 1074
 						}
@@ -1081,11 +1081,11 @@  discard block
 block discarded – undo
1081 1081
 			$m['value'] = FrmAppHelper::maybe_json_decode( $m['value'] );
1082 1082
 		}
1083 1083
 
1084
-		$post['postmeta'][ (string) $meta->meta_key ] = $m['value'];
1084
+		$post['postmeta'][(string) $meta->meta_key] = $m['value'];
1085 1085
 	}
1086 1086
 
1087 1087
 	private static function populate_layout( &$post, $layout ) {
1088
-		$post['layout'][ (string) $layout->type ] = (string) $layout->data;
1088
+		$post['layout'][(string) $layout->type] = (string) $layout->data;
1089 1089
 	}
1090 1090
 
1091 1091
 	/**
@@ -1113,11 +1113,11 @@  discard block
 block discarded – undo
1113 1113
 				$name = (string) $c;
1114 1114
 			}
1115 1115
 
1116
-			if ( ! isset( $post['tax_input'][ $taxonomy ] ) ) {
1117
-				$post['tax_input'][ $taxonomy ] = array();
1116
+			if ( ! isset( $post['tax_input'][$taxonomy] ) ) {
1117
+				$post['tax_input'][$taxonomy] = array();
1118 1118
 			}
1119 1119
 
1120
-			$post['tax_input'][ $taxonomy ][] = $name;
1120
+			$post['tax_input'][$taxonomy][] = $name;
1121 1121
 			unset( $name );
1122 1122
 		}
1123 1123
 	}
@@ -1250,7 +1250,7 @@  discard block
 block discarded – undo
1250 1250
 
1251 1251
 		$message = '<ul>';
1252 1252
 		foreach ( $result as $type => $results ) {
1253
-			if ( ! isset( $t_strings[ $type ] ) ) {
1253
+			if ( ! isset( $t_strings[$type] ) ) {
1254 1254
 				// only print imported and updated
1255 1255
 				continue;
1256 1256
 			}
@@ -1262,7 +1262,7 @@  discard block
 block discarded – undo
1262 1262
 			}
1263 1263
 
1264 1264
 			if ( ! empty( $s_message ) ) {
1265
-				$message .= '<li><strong>' . $t_strings[ $type ] . ':</strong> ';
1265
+				$message .= '<li><strong>' . $t_strings[$type] . ':</strong> ';
1266 1266
 				$message .= implode( ', ', $s_message );
1267 1267
 				$message .= '</li>';
1268 1268
 			}
@@ -1314,8 +1314,8 @@  discard block
 block discarded – undo
1314 1314
 			'actions' => sprintf( _n( '%1$s Form Action', '%1$s Form Actions', $m, 'formidable' ), $m ),
1315 1315
 		);
1316 1316
 
1317
-		if ( isset( $strings[ $type ] ) ) {
1318
-			$s_message[] = $strings[ $type ];
1317
+		if ( isset( $strings[$type] ) ) {
1318
+			$s_message[] = $strings[$type];
1319 1319
 		} else {
1320 1320
 			$string = ' ' . $m . ' ' . ucfirst( $type );
1321 1321
 
@@ -1463,7 +1463,7 @@  discard block
 block discarded – undo
1463 1463
 
1464 1464
 		foreach ( $options as $key => $option ) {
1465 1465
 			if ( is_array( $option ) && ! empty( $option['image'] ) ) {
1466
-				$options[ $key ]['src'] = wp_get_attachment_url( $option['image'] );
1466
+				$options[$key]['src'] = wp_get_attachment_url( $option['image'] );
1467 1467
 				$updated                = true;
1468 1468
 			}
1469 1469
 		}
@@ -1492,8 +1492,8 @@  discard block
 block discarded – undo
1492 1492
 	 */
1493 1493
 	private static function remove_defaults( $defaults, &$saved ) {
1494 1494
 		foreach ( $saved as $key => $value ) {
1495
-			if ( isset( $defaults[ $key ] ) && $defaults[ $key ] === $value ) {
1496
-				unset( $saved[ $key ] );
1495
+			if ( isset( $defaults[$key] ) && $defaults[$key] === $value ) {
1496
+				unset( $saved[$key] );
1497 1497
 			}
1498 1498
 		}
1499 1499
 	}
@@ -1504,14 +1504,14 @@  discard block
 block discarded – undo
1504 1504
 	 * @since 3.06
1505 1505
 	 */
1506 1506
 	private static function remove_default_html( $html_name, $defaults, &$options ) {
1507
-		if ( ! isset( $options[ $html_name ] ) || ! isset( $defaults[ $html_name ] ) ) {
1507
+		if ( ! isset( $options[$html_name] ) || ! isset( $defaults[$html_name] ) ) {
1508 1508
 			return;
1509 1509
 		}
1510 1510
 
1511
-		$old_html     = str_replace( "\r\n", "\n", $options[ $html_name ] );
1512
-		$default_html = $defaults[ $html_name ];
1511
+		$old_html     = str_replace( "\r\n", "\n", $options[$html_name] );
1512
+		$default_html = $defaults[$html_name];
1513 1513
 		if ( $old_html == $default_html ) {
1514
-			unset( $options[ $html_name ] );
1514
+			unset( $options[$html_name] );
1515 1515
 
1516 1516
 			return;
1517 1517
 		}
@@ -1519,7 +1519,7 @@  discard block
 block discarded – undo
1519 1519
 		// Account for some of the older field default HTML.
1520 1520
 		$default_html = str_replace( ' id="frm_desc_field_[key]"', '', $default_html );
1521 1521
 		if ( $old_html == $default_html ) {
1522
-			unset( $options[ $html_name ] );
1522
+			unset( $options[$html_name] );
1523 1523
 		}
1524 1524
 	}
1525 1525
 
@@ -1606,8 +1606,8 @@  discard block
 block discarded – undo
1606 1606
 		);
1607 1607
 
1608 1608
 		foreach ( $post_settings as $post_setting ) {
1609
-			if ( isset( $form_options[ $post_setting ] ) ) {
1610
-				$new_action['post_content'][ $post_setting ] = $form_options[ $post_setting ];
1609
+			if ( isset( $form_options[$post_setting] ) ) {
1610
+				$new_action['post_content'][$post_setting] = $form_options[$post_setting];
1611 1611
 			}
1612 1612
 			unset( $post_setting );
1613 1613
 		}
@@ -1678,11 +1678,11 @@  discard block
 block discarded – undo
1678 1678
 		foreach ( $post_content as $key => $setting ) {
1679 1679
 			if ( ! is_array( $setting ) && in_array( $key, $basic_fields ) ) {
1680 1680
 				// Replace old IDs with new IDs
1681
-				$post_content[ $key ] = str_replace( $old, $new, $setting );
1681
+				$post_content[$key] = str_replace( $old, $new, $setting );
1682 1682
 			} elseif ( is_array( $setting ) && in_array( $key, $array_fields ) ) {
1683 1683
 				foreach ( $setting as $k => $val ) {
1684 1684
 					// Replace old IDs with new IDs
1685
-					$post_content[ $key ][ $k ] = str_replace( $old, $new, $val );
1685
+					$post_content[$key][$k] = str_replace( $old, $new, $val );
1686 1686
 				}
1687 1687
 			}
1688 1688
 			unset( $key, $setting );
@@ -1758,8 +1758,8 @@  discard block
 block discarded – undo
1758 1758
 	private static function remove_deprecated_notification_settings( $form_id, $form_options ) {
1759 1759
 		$delete_settings = array( 'notification', 'autoresponder', 'email_to' );
1760 1760
 		foreach ( $delete_settings as $index ) {
1761
-			if ( isset( $form_options[ $index ] ) ) {
1762
-				unset( $form_options[ $index ] );
1761
+			if ( isset( $form_options[$index] ) ) {
1762
+				unset( $form_options[$index] );
1763 1763
 			}
1764 1764
 		}
1765 1765
 		FrmForm::update( $form_id, array( 'options' => $form_options ) );
@@ -1812,12 +1812,12 @@  discard block
 block discarded – undo
1812 1812
 			'reply_to_name' => '',
1813 1813
 		);
1814 1814
 		foreach ( $reply_fields as $f => $val ) {
1815
-			if ( isset( $notification[ $f ] ) ) {
1816
-				$atts[ $f ] = $notification[ $f ];
1817
-				if ( 'custom' == $notification[ $f ] ) {
1818
-					$atts[ $f ] = $notification[ 'cust_' . $f ];
1819
-				} elseif ( is_numeric( $atts[ $f ] ) && ! empty( $atts[ $f ] ) ) {
1820
-					$atts[ $f ] = '[' . $atts[ $f ] . ']';
1815
+			if ( isset( $notification[$f] ) ) {
1816
+				$atts[$f] = $notification[$f];
1817
+				if ( 'custom' == $notification[$f] ) {
1818
+					$atts[$f] = $notification['cust_' . $f];
1819
+				} elseif ( is_numeric( $atts[$f] ) && ! empty( $atts[$f] ) ) {
1820
+					$atts[$f] = '[' . $atts[$f] . ']';
1821 1821
 				}
1822 1822
 			}
1823 1823
 			unset( $f, $val );
@@ -1848,13 +1848,13 @@  discard block
 block discarded – undo
1848 1848
 		foreach ( $atts['email_to'] as $key => $email_field ) {
1849 1849
 
1850 1850
 			if ( is_numeric( $email_field ) ) {
1851
-				$atts['email_to'][ $key ] = '[' . $email_field . ']';
1851
+				$atts['email_to'][$key] = '[' . $email_field . ']';
1852 1852
 			}
1853 1853
 
1854 1854
 			if ( strpos( $email_field, '|' ) ) {
1855 1855
 				$email_opt = explode( '|', $email_field );
1856 1856
 				if ( isset( $email_opt[0] ) ) {
1857
-					$atts['email_to'][ $key ] = '[' . $email_opt[0] . ' show=' . $email_opt[1] . ']';
1857
+					$atts['email_to'][$key] = '[' . $email_opt[0] . ' show=' . $email_opt[1] . ']';
1858 1858
 				}
1859 1859
 				unset( $email_opt );
1860 1860
 			}
@@ -1875,12 +1875,12 @@  discard block
 block discarded – undo
1875 1875
 		// Add more fields to the new notification
1876 1876
 		$add_fields = array( 'email_message', 'email_subject', 'plain_text', 'inc_user_info', 'conditions' );
1877 1877
 		foreach ( $add_fields as $add_field ) {
1878
-			if ( isset( $notification[ $add_field ] ) ) {
1879
-				$new_notification['post_content'][ $add_field ] = $notification[ $add_field ];
1878
+			if ( isset( $notification[$add_field] ) ) {
1879
+				$new_notification['post_content'][$add_field] = $notification[$add_field];
1880 1880
 			} elseif ( in_array( $add_field, array( 'plain_text', 'inc_user_info' ) ) ) {
1881
-				$new_notification['post_content'][ $add_field ] = 0;
1881
+				$new_notification['post_content'][$add_field] = 0;
1882 1882
 			} else {
1883
-				$new_notification['post_content'][ $add_field ] = '';
1883
+				$new_notification['post_content'][$add_field] = '';
1884 1884
 			}
1885 1885
 			unset( $add_field );
1886 1886
 		}
@@ -1904,7 +1904,7 @@  discard block
 block discarded – undo
1904 1904
 		if ( isset( $post_content['conditions'] ) && is_array( $post_content['conditions'] ) ) {
1905 1905
 			foreach ( $post_content['conditions'] as $email_key => $val ) {
1906 1906
 				if ( is_numeric( $email_key ) ) {
1907
-					$post_content['conditions'][ $email_key ] = self::switch_action_field_ids( $val, array( 'hide_field' ) );
1907
+					$post_content['conditions'][$email_key] = self::switch_action_field_ids( $val, array( 'hide_field' ) );
1908 1908
 				}
1909 1909
 				unset( $email_key, $val );
1910 1910
 			}
Please login to merge, or discard this patch.
classes/views/xml/xml.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -18,17 +18,17 @@  discard block
 block discarded – undo
18 18
 
19 19
 foreach ( $type as $tb_type ) {
20 20
 
21
-	if ( ! isset( $tables[ $tb_type ] ) ) {
21
+	if ( ! isset( $tables[$tb_type] ) ) {
22 22
 		do_action( 'frm_xml_import_' . $tb_type, $args );
23 23
 		continue;
24 24
 	}
25 25
 
26
-	if ( ! isset( $records[ $tb_type ] ) ) {
26
+	if ( ! isset( $records[$tb_type] ) ) {
27 27
 		// No records.
28 28
 		continue;
29 29
 	}
30 30
 
31
-	$item_ids = $records[ $tb_type ];
31
+	$item_ids = $records[$tb_type];
32 32
 
33 33
 	if ( in_array( $tb_type, array( 'styles', 'actions' ), true ) ) {
34 34
 		include dirname( __FILE__ ) . '/posts_xml.php';
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 		include FrmProAppHelper::plugin_path() . '/classes/views/xml/' . $tb_type . '_xml.php';
39 39
 	}
40 40
 
41
-	unset( $item_ids, $records[ $tb_type ], $tb_type );
41
+	unset( $item_ids, $records[$tb_type], $tb_type );
42 42
 }
43 43
 
44 44
 /**
Please login to merge, or discard this patch.
classes/models/FrmApplicationTemplate.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 		 *
39 39
 		 * @param array $keys
40 40
 		 */
41
-		self::$keys             = apply_filters(
41
+		self::$keys = apply_filters(
42 42
 			'frm_application_data_keys',
43 43
 			array( 'key', 'name', 'description', 'link', 'categories', 'views', 'forms' )
44 44
 		);
@@ -100,17 +100,17 @@  discard block
 block discarded – undo
100 100
 	public function as_js_object() {
101 101
 		$application = array();
102 102
 		foreach ( self::$keys as $key ) {
103
-			if ( ! isset( $this->api_data[ $key ] ) ) {
103
+			if ( ! isset( $this->api_data[$key] ) ) {
104 104
 				continue;
105 105
 			}
106 106
 
107
-			$value = $this->api_data[ $key ];
107
+			$value = $this->api_data[$key];
108 108
 
109 109
 			if ( 'icon' === $key ) {
110 110
 				// Icon is an array. The first array item is the image URL.
111
-				$application[ $key ] = reset( $value );
111
+				$application[$key] = reset( $value );
112 112
 			} elseif ( 'categories' === $key ) {
113
-				$application[ $key ] = array_values(
113
+				$application[$key] = array_values(
114 114
 					array_filter(
115 115
 						$value,
116 116
 						function( $category ) {
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
 					// Strip off the " Template" text at the end of the name as it takes up space.
130 130
 					$value = substr( $value, 0, -9 );
131 131
 				}
132
-				$application[ $key ] = $value;
132
+				$application[$key] = $value;
133 133
 			}
134 134
 		}
135 135
 
Please login to merge, or discard this patch.