Completed
Pull Request — master (#2266)
by
unknown
46s
created
classes/helpers/FrmCurrencyHelper.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -16,10 +16,10 @@
 block discarded – undo
16 16
 	public static function get_currency( $currency ) {
17 17
 		$currency   = strtoupper( $currency );
18 18
 		$currencies = self::get_currencies();
19
-		if ( isset( $currencies[ $currency ] ) ) {
20
-			$currency = $currencies[ $currency ];
21
-		} elseif ( isset( $currencies[ strtolower( $currency ) ] ) ) {
22
-			$currency = $currencies[ strtolower( $currency ) ];
19
+		if ( isset( $currencies[$currency] ) ) {
20
+			$currency = $currencies[$currency];
21
+		} elseif ( isset( $currencies[strtolower( $currency )] ) ) {
22
+			$currency = $currencies[strtolower( $currency )];
23 23
 		} else {
24 24
 			$currency = $currencies['USD'];
25 25
 		}
Please login to merge, or discard this patch.
classes/helpers/FrmTipsHelper.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 			'page'  => '',
46 46
 			'class' => 'frm-mt-0',
47 47
 		);
48
-		$tip      = array_merge( $defaults, $tip );
48
+		$tip = array_merge( $defaults, $tip );
49 49
 
50 50
 		if ( isset( $tip['link'] ) && ! isset( $tip['link']['medium'] ) ) {
51 51
 			$tip['link']['medium'] = 'tip';
@@ -372,7 +372,7 @@  discard block
 block discarded – undo
372 372
 	 * @return array
373 373
 	 */
374 374
 	public static function get_banner_tip() {
375
-		$tips       = array(
375
+		$tips = array(
376 376
 			array(
377 377
 				'link' => array(
378 378
 					'medium'  => 'banner',
@@ -399,7 +399,7 @@  discard block
 block discarded – undo
399 399
 			),
400 400
 		);
401 401
 		$random     = rand( 0, count( $tips ) - 1 );
402
-		$tip        = $tips[ $random ];
402
+		$tip        = $tips[$random];
403 403
 		$tip['num'] = $random;
404 404
 
405 405
 		return $tip;
@@ -408,7 +408,7 @@  discard block
 block discarded – undo
408 408
 	public static function get_random_tip( $tips ) {
409 409
 		$random = rand( 0, count( $tips ) - 1 );
410 410
 
411
-		return $tips[ $random ];
411
+		return $tips[$random];
412 412
 	}
413 413
 
414 414
 	/**
Please login to merge, or discard this patch.
stripe/models/FrmTransLitePayment.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -126,11 +126,11 @@
 block discarded – undo
126 126
 		foreach ( $payments as $payment ) {
127 127
 			list( $amount, $currency ) = FrmTransLiteAppHelper::get_amount_and_currency_from_payment( $payment );
128 128
 
129
-			if ( ! isset( $data[ $currency ] ) ) {
130
-				$data[ $currency ] = 0;
129
+			if ( ! isset( $data[$currency] ) ) {
130
+				$data[$currency] = 0;
131 131
 			}
132 132
 
133
-			$data[ $currency ] += floatval( $amount );
133
+			$data[$currency] += floatval( $amount );
134 134
 		}
135 135
 
136 136
 		return $data;
Please login to merge, or discard this patch.
classes/helpers/FrmEmailSummaryHelper.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -236,11 +236,11 @@  discard block
 block discarded – undo
236 236
 	 */
237 237
 	public static function get_last_sent_date( $type ) {
238 238
 		$options = self::get_options();
239
-		if ( empty( $options[ 'last_' . $type ] ) ) {
239
+		if ( empty( $options['last_' . $type] ) ) {
240 240
 			return false;
241 241
 		}
242 242
 
243
-		return $options[ 'last_' . $type ];
243
+		return $options['last_' . $type];
244 244
 	}
245 245
 
246 246
 	/**
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
252 252
 	public static function set_last_sent_date( $type, $value = null ) {
253 253
 		$options = self::get_options();
254 254
 
255
-		$options[ 'last_' . $type ] = null === $value ? self::get_date_from_today() : '';
255
+		$options['last_' . $type] = null === $value ? self::get_date_from_today() : '';
256 256
 		self::save_options( $options );
257 257
 	}
258 258
 
Please login to merge, or discard this patch.
stripe/helpers/FrmStrpLiteConnectHelper.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 			'user_id'               => get_current_user_id(),
109 109
 			'frm_strp_connect_mode' => $mode,
110 110
 		);
111
-		$data            = self::post_to_connect_server( 'initialize', $additional_body );
111
+		$data = self::post_to_connect_server( 'initialize', $additional_body );
112 112
 
113 113
 		if ( is_string( $data ) ) {
114 114
 			return $data;
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 	 * @return object|string
144 144
 	 */
145 145
 	private static function post_to_connect_server( $action, $additional_body = array() ) {
146
-		$body    = array(
146
+		$body = array(
147 147
 			'frm_strp_connect_action' => $action,
148 148
 			'frm_strp_connect_mode'   => FrmStrpLiteAppHelper::active_mode(),
149 149
 		);
Please login to merge, or discard this patch.
classes/views/frm-fields/front-end/checkbox-field.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -87,6 +87,6 @@
 block discarded – undo
87 87
 
88 88
 		?></div>
89 89
 <?php
90
-		++$option_index;
90
+		++ $option_index;
91 91
 	}//end foreach
92 92
 }//end if
Please login to merge, or discard this patch.
classes/views/frm-fields/front-end/combo-field/combo-field.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 			$sub_field_class   = "frm_form_field form-field frm_form_subfield-{$name} {$sub_field['wrapper_classes']}";
42 42
 			$sub_field_desc    = FrmField::get_option( $field, $name . '_desc' );
43 43
 
44
-			if ( isset( $errors[ 'field' . $field_id . '-' . $name ] ) ) {
44
+			if ( isset( $errors['field' . $field_id . '-' . $name] ) ) {
45 45
 				$sub_field_class .= ' frm_blank_field';
46 46
 			}
47 47
 			?>
@@ -61,10 +61,10 @@  discard block
 block discarded – undo
61 61
 						<input
62 62
 							type="<?php echo esc_attr( $sub_field['type'] ); ?>"
63 63
 							id="<?php echo esc_attr( $html_id . '_' . $name ); ?>"
64
-							value="<?php echo esc_attr( isset( $field_value[ $name ] ) ? $field_value[ $name ] : '' ); ?>"
64
+							value="<?php echo esc_attr( isset( $field_value[$name] ) ? $field_value[$name] : '' ); ?>"
65 65
 							<?php
66
-							if ( ! empty( $field_value[ $name ] ) ) {
67
-								echo 'data-frmval="' . esc_attr( $field_value[ $name ] ) . '" ';
66
+							if ( ! empty( $field_value[$name] ) ) {
67
+								echo 'data-frmval="' . esc_attr( $field_value[$name] ) . '" ';
68 68
 							}
69 69
 							if ( empty( $args['remove_names'] ) ) {
70 70
 								echo 'name="' . esc_attr( $field_name ) . '[' . esc_attr( $name ) . ']" ';
@@ -81,9 +81,9 @@  discard block
 block discarded – undo
81 81
 				}
82 82
 
83 83
 				// Don't show individual field errors when there is a combo field error.
84
-				if ( ! empty( $errors ) && isset( $errors[ 'field' . $field_id . '-' . $name ] ) && ! isset( $errors[ 'field' . $field_id ] ) ) {
84
+				if ( ! empty( $errors ) && isset( $errors['field' . $field_id . '-' . $name] ) && ! isset( $errors['field' . $field_id] ) ) {
85 85
 					?>
86
-					<div class="frm_error" role="alert"><?php echo esc_html( $errors[ 'field' . $field_id . '-' . $name ] ); ?></div>
86
+					<div class="frm_error" role="alert"><?php echo esc_html( $errors['field' . $field_id . '-' . $name] ); ?></div>
87 87
 				<?php } ?>
88 88
 			</div>
89 89
 			<?php
Please login to merge, or discard this patch.
classes/controllers/FrmSettingsController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 				$section['function'] = $original;
159 159
 			}
160 160
 
161
-			$sections[ $key ] = $section;
161
+			$sections[$key] = $section;
162 162
 		}//end foreach
163 163
 
164 164
 		return $sections;
@@ -170,11 +170,11 @@  discard block
 block discarded – undo
170 170
 
171 171
 		$section  = FrmAppHelper::get_post_param( 'tab', '', 'sanitize_text_field' );
172 172
 		$sections = self::get_settings_tabs();
173
-		if ( ! isset( $sections[ $section ] ) ) {
173
+		if ( ! isset( $sections[$section] ) ) {
174 174
 			wp_die();
175 175
 		}
176 176
 
177
-		$section = $sections[ $section ];
177
+		$section = $sections[$section];
178 178
 
179 179
 		if ( isset( $section['class'] ) ) {
180 180
 			call_user_func( array( $section['class'], $section['function'] ) );
Please login to merge, or discard this patch.
classes/models/FrmEntryValidate.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -145,7 +145,8 @@
 block discarded – undo
145 145
 
146 146
 		if ( $posted_field->required == '1' && FrmAppHelper::is_empty_value( $value ) ) {
147 147
 			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $posted_field, 'blank' );
148
-		} elseif ( ! isset( $_POST['item_name'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
148
+		} elseif ( ! isset( $_POST['item_name'] ) ) {
149
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
149 150
 			self::maybe_add_item_name( $value, $posted_field );
150 151
 		}
151 152
 
Please login to merge, or discard this patch.
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 			return $errors;
28 28
 		}
29 29
 
30
-		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' ) ) ) {
30
+		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' ) ) ) {
31 31
 			$frm_settings   = FrmAppHelper::get_settings();
32 32
 			$errors['form'] = $frm_settings->admin_permission;
33 33
 		}
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 		$args = wp_parse_args( $args, $defaults );
131 131
 
132 132
 		if ( empty( $args['parent_field_id'] ) ) {
133
-			$value = isset( $values['item_meta'][ $args['id'] ] ) ? $values['item_meta'][ $args['id'] ] : '';
133
+			$value = isset( $values['item_meta'][$args['id']] ) ? $values['item_meta'][$args['id']] : '';
134 134
 		} else {
135 135
 			// value is from a nested form
136 136
 			$value = $values;
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 		}
152 152
 
153 153
 		if ( $posted_field->required == '1' && FrmAppHelper::is_empty_value( $value ) ) {
154
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $posted_field, 'blank' );
154
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $posted_field, 'blank' );
155 155
 		} elseif ( ! isset( $_POST['item_name'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
156 156
 			self::maybe_add_item_name( $value, $posted_field );
157 157
 		}
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
 			$pattern = self::phone_format( $field );
234 234
 
235 235
 			if ( ! preg_match( $pattern, $value ) ) {
236
-				$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
236
+				$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
237 237
 			}
238 238
 		}
239 239
 	}
@@ -346,7 +346,7 @@  discard block
 block discarded – undo
346 346
 	 */
347 347
 	private static function form_is_in_progress( $values ) {
348 348
 		return FrmAppHelper::pro_is_installed() &&
349
-			( isset( $values[ 'frm_page_order_' . $values['form_id'] ] ) || FrmAppHelper::get_post_param( 'frm_next_page' ) ) &&
349
+			( isset( $values['frm_page_order_' . $values['form_id']] ) || FrmAppHelper::get_post_param( 'frm_next_page' ) ) &&
350 350
 			FrmField::get_all_types_in_form( $values['form_id'], 'break' );
351 351
 	}
352 352
 
@@ -592,9 +592,9 @@  discard block
 block discarded – undo
592 592
 			foreach ( $datas['missing_keys'] as $key_index => $key ) {
593 593
 				$found = self::is_akismet_guest_info_value( $key, $value, $field_id, $datas['name_field_ids'], $values );
594 594
 				if ( $found ) {
595
-					$datas[ $key ]             = $value;
595
+					$datas[$key]             = $value;
596 596
 					$datas['frm_duplicated'][] = $field_id;
597
-					unset( $datas['missing_keys'][ $key_index ] );
597
+					unset( $datas['missing_keys'][$key_index] );
598 598
 				}
599 599
 			}
600 600
 		}//end foreach
@@ -637,11 +637,11 @@  discard block
 block discarded – undo
637 637
 					if ( 'Name' !== $field->name ) {
638 638
 						continue;
639 639
 					}
640
-					if ( isset( $fields[ $index + 1 ] ) && 'Last' === $fields[ $index + 1 ]->name ) {
641
-						if ( empty( $values[ absint( $fields[ $index + 1 ]->id ) ] ) ) {
640
+					if ( isset( $fields[$index + 1] ) && 'Last' === $fields[$index + 1]->name ) {
641
+						if ( empty( $values[absint( $fields[$index + 1]->id )] ) ) {
642 642
 							continue;
643 643
 						}
644
-						$value .= ' ' . $values[ $fields[ $index + 1 ]->id ];
644
+						$value .= ' ' . $values[$fields[$index + 1]->id];
645 645
 						return true;
646 646
 					}
647 647
 				}
@@ -660,13 +660,13 @@  discard block
 block discarded – undo
660 660
 	 */
661 661
 	private static function get_name_text_fields( $form_id ) {
662 662
 		$name_text_fields_is_initialized = is_array( self::$name_text_fields );
663
-		if ( $name_text_fields_is_initialized && isset( self::$name_text_fields[ $form_id ] ) ) {
664
-			return self::$name_text_fields[ $form_id ];
663
+		if ( $name_text_fields_is_initialized && isset( self::$name_text_fields[$form_id] ) ) {
664
+			return self::$name_text_fields[$form_id];
665 665
 		}
666 666
 		if ( ! $name_text_fields_is_initialized ) {
667 667
 			self::$name_text_fields = array();
668 668
 		}
669
-		self::$name_text_fields[ $form_id ] = FrmDb::get_results(
669
+		self::$name_text_fields[$form_id] = FrmDb::get_results(
670 670
 			'frm_fields',
671 671
 			array(
672 672
 				'form_id' => $form_id,
@@ -677,7 +677,7 @@  discard block
 block discarded – undo
677 677
 			array( 'order_by' => 'field_order ASC' )
678 678
 		);
679 679
 
680
-		return self::$name_text_fields[ $form_id ];
680
+		return self::$name_text_fields[$form_id];
681 681
 	}
682 682
 
683 683
 	private static function add_server_values_to_akismet( &$datas ) {
@@ -686,7 +686,7 @@  discard block
 block discarded – undo
686 686
 
687 687
 			// Send any potentially useful $_SERVER vars, but avoid sending junk we don't need.
688 688
 			if ( $include_value ) {
689
-				$datas[ $key ] = $value;
689
+				$datas[$key] = $value;
690 690
 			}
691 691
 			unset( $key, $value );
692 692
 		}
@@ -703,10 +703,10 @@  discard block
 block discarded – undo
703 703
 	private static function add_comment_content_to_akismet( &$datas, $values ) {
704 704
 		if ( isset( $datas['frm_duplicated'] ) ) {
705 705
 			foreach ( $datas['frm_duplicated'] as $index ) {
706
-				if ( isset( $values['item_meta'][ $index ] ) ) {
707
-					unset( $values['item_meta'][ $index ] );
706
+				if ( isset( $values['item_meta'][$index] ) ) {
707
+					unset( $values['item_meta'][$index] );
708 708
 				} else {
709
-					unset( $values[ $index ] );
709
+					unset( $values[$index] );
710 710
 				}
711 711
 			}
712 712
 			unset( $datas['frm_duplicated'] );
@@ -725,14 +725,14 @@  discard block
 block discarded – undo
725 725
 	private static function skip_adding_values_to_akismet( &$values ) {
726 726
 		$skipped_fields = self::get_akismet_skipped_field_ids( $values );
727 727
 		foreach ( $skipped_fields as $skipped_field ) {
728
-			if ( ! isset( $values['item_meta'][ $skipped_field->id ] ) ) {
728
+			if ( ! isset( $values['item_meta'][$skipped_field->id] ) ) {
729 729
 				continue;
730 730
 			}
731 731
 
732 732
 			if ( self::should_really_skip_field( $skipped_field, $values ) ) {
733
-				unset( $values['item_meta'][ $skipped_field->id ] );
734
-				if ( isset( $values['item_meta']['other'][ $skipped_field->id ] ) ) {
735
-					unset( $values['item_meta']['other'][ $skipped_field->id ] );
733
+				unset( $values['item_meta'][$skipped_field->id] );
734
+				if ( isset( $values['item_meta']['other'][$skipped_field->id] ) ) {
735
+					unset( $values['item_meta']['other'][$skipped_field->id] );
736 736
 				}
737 737
 			}
738 738
 		}
@@ -768,14 +768,14 @@  discard block
 block discarded – undo
768 768
 		}
769 769
 
770 770
 		// If a choice field has Other option, but Other is not selected.
771
-		if ( empty( $values['item_meta']['other'][ $field_data->id ] ) ) {
771
+		if ( empty( $values['item_meta']['other'][$field_data->id] ) ) {
772 772
 			return true;
773 773
 		}
774 774
 
775 775
 		// Check if submitted value is same as one of field option.
776 776
 		foreach ( $field_data->options as $option ) {
777 777
 			$option_value = ! is_array( $option ) ? $option : ( isset( $option['value'] ) ? $option['value'] : '' );
778
-			if ( $values['item_meta']['other'][ $field_data->id ] === $option_value ) {
778
+			if ( $values['item_meta']['other'][$field_data->id] === $option_value ) {
779 779
 				return true;
780 780
 			}
781 781
 		}
@@ -846,7 +846,7 @@  discard block
 block discarded – undo
846 846
 
847 847
 			// Convert name array to string.
848 848
 			if ( isset( $value['first'] ) && isset( $value['last'] ) ) {
849
-				$values['item_meta'][ $field_id ] = trim( implode( ' ', $value ) );
849
+				$values['item_meta'][$field_id] = trim( implode( ' ', $value ) );
850 850
 				$values['name_field_ids'][]       = $field_id;
851 851
 				continue;
852 852
 			}
@@ -867,8 +867,8 @@  discard block
 block discarded – undo
867 867
 						continue;
868 868
 					}
869 869
 
870
-					if ( ! isset( $values['item_meta'][ $subsubindex ] ) ) {
871
-						$values['item_meta'][ $subsubindex ] = array();
870
+					if ( ! isset( $values['item_meta'][$subsubindex] ) ) {
871
+						$values['item_meta'][$subsubindex] = array();
872 872
 					}
873 873
 
874 874
 					// Convert name array to string.
@@ -878,11 +878,11 @@  discard block
 block discarded – undo
878 878
 						$values['name_field_ids'][] = $subsubindex;
879 879
 					}
880 880
 
881
-					$values['item_meta'][ $subsubindex ][] = $subsubvalue;
881
+					$values['item_meta'][$subsubindex][] = $subsubvalue;
882 882
 				}
883 883
 			}//end foreach
884 884
 
885
-			unset( $values['item_meta'][ $field_id ] );
885
+			unset( $values['item_meta'][$field_id] );
886 886
 		}//end foreach
887 887
 
888 888
 		return $form_ids;
Please login to merge, or discard this patch.