Completed
Pull Request — master (#2383)
by
unknown
37s
created
classes/models/FrmEntryValidate.php 1 patch
Spacing   +32 added lines, -32 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
 		}
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
 		$option_is_valid = (bool) apply_filters( 'frm_option_is_valid', $option_is_valid, $value, $posted_field );
205 205
 
206 206
 		if ( ! $option_is_valid ) {
207
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $posted_field, 'invalid' );
207
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $posted_field, 'invalid' );
208 208
 		}
209 209
 	}
210 210
 
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
295 295
 		FrmFieldsHelper::prepare_new_front_field( $values, $field_object );
296 296
 
297 297
 		$separate_value = FrmField::get_option( $field_object, 'separate_value' );
298
-		$map_callback   = function ( $option ) use ( $separate_value ) {
298
+		$map_callback   = function( $option ) use ( $separate_value ) {
299 299
 			if ( is_array( $option ) ) {
300 300
 				$option_value = $separate_value ? $option['value'] : $option['label'];
301 301
 			} else {
@@ -369,7 +369,7 @@  discard block
 block discarded – undo
369 369
 			$pattern = self::phone_format( $field );
370 370
 
371 371
 			if ( ! preg_match( $pattern, $value ) ) {
372
-				$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
372
+				$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
373 373
 			}
374 374
 		}
375 375
 	}
@@ -491,7 +491,7 @@  discard block
 block discarded – undo
491 491
 	 */
492 492
 	private static function form_is_in_progress( $values ) {
493 493
 		return FrmAppHelper::pro_is_installed() &&
494
-			( isset( $values[ 'frm_page_order_' . $values['form_id'] ] ) || FrmAppHelper::get_post_param( 'frm_next_page' ) ) &&
494
+			( isset( $values['frm_page_order_' . $values['form_id']] ) || FrmAppHelper::get_post_param( 'frm_next_page' ) ) &&
495 495
 			FrmField::get_all_types_in_form( $values['form_id'], 'break' );
496 496
 	}
497 497
 
@@ -701,9 +701,9 @@  discard block
 block discarded – undo
701 701
 			foreach ( $datas['missing_keys'] as $key_index => $key ) {
702 702
 				$found = self::is_akismet_guest_info_value( $key, $value, $field_id, $datas['name_field_ids'], $values );
703 703
 				if ( $found ) {
704
-					$datas[ $key ]             = $value;
704
+					$datas[$key]             = $value;
705 705
 					$datas['frm_duplicated'][] = $field_id;
706
-					unset( $datas['missing_keys'][ $key_index ] );
706
+					unset( $datas['missing_keys'][$key_index] );
707 707
 				}
708 708
 			}
709 709
 		}//end foreach
@@ -746,11 +746,11 @@  discard block
 block discarded – undo
746 746
 					if ( 'Name' !== $field->name ) {
747 747
 						continue;
748 748
 					}
749
-					if ( isset( $fields[ $index + 1 ] ) && 'Last' === $fields[ $index + 1 ]->name ) {
750
-						if ( empty( $values[ absint( $fields[ $index + 1 ]->id ) ] ) ) {
749
+					if ( isset( $fields[$index + 1] ) && 'Last' === $fields[$index + 1]->name ) {
750
+						if ( empty( $values[absint( $fields[$index + 1]->id )] ) ) {
751 751
 							continue;
752 752
 						}
753
-						$value .= ' ' . $values[ $fields[ $index + 1 ]->id ];
753
+						$value .= ' ' . $values[$fields[$index + 1]->id];
754 754
 						return true;
755 755
 					}
756 756
 				}
@@ -769,13 +769,13 @@  discard block
 block discarded – undo
769 769
 	 */
770 770
 	private static function get_name_text_fields( $form_id ) {
771 771
 		$name_text_fields_is_initialized = is_array( self::$name_text_fields );
772
-		if ( $name_text_fields_is_initialized && isset( self::$name_text_fields[ $form_id ] ) ) {
773
-			return self::$name_text_fields[ $form_id ];
772
+		if ( $name_text_fields_is_initialized && isset( self::$name_text_fields[$form_id] ) ) {
773
+			return self::$name_text_fields[$form_id];
774 774
 		}
775 775
 		if ( ! $name_text_fields_is_initialized ) {
776 776
 			self::$name_text_fields = array();
777 777
 		}
778
-		self::$name_text_fields[ $form_id ] = FrmDb::get_results(
778
+		self::$name_text_fields[$form_id] = FrmDb::get_results(
779 779
 			'frm_fields',
780 780
 			array(
781 781
 				'form_id' => $form_id,
@@ -786,7 +786,7 @@  discard block
 block discarded – undo
786 786
 			array( 'order_by' => 'field_order ASC' )
787 787
 		);
788 788
 
789
-		return self::$name_text_fields[ $form_id ];
789
+		return self::$name_text_fields[$form_id];
790 790
 	}
791 791
 
792 792
 	private static function add_server_values_to_akismet( &$datas ) {
@@ -795,7 +795,7 @@  discard block
 block discarded – undo
795 795
 
796 796
 			// Send any potentially useful $_SERVER vars, but avoid sending junk we don't need.
797 797
 			if ( $include_value ) {
798
-				$datas[ $key ] = $value;
798
+				$datas[$key] = $value;
799 799
 			}
800 800
 			unset( $key, $value );
801 801
 		}
@@ -812,10 +812,10 @@  discard block
 block discarded – undo
812 812
 	private static function add_comment_content_to_akismet( &$datas, $values ) {
813 813
 		if ( isset( $datas['frm_duplicated'] ) ) {
814 814
 			foreach ( $datas['frm_duplicated'] as $index ) {
815
-				if ( isset( $values['item_meta'][ $index ] ) ) {
816
-					unset( $values['item_meta'][ $index ] );
815
+				if ( isset( $values['item_meta'][$index] ) ) {
816
+					unset( $values['item_meta'][$index] );
817 817
 				} else {
818
-					unset( $values[ $index ] );
818
+					unset( $values[$index] );
819 819
 				}
820 820
 			}
821 821
 			unset( $datas['frm_duplicated'] );
@@ -834,14 +834,14 @@  discard block
 block discarded – undo
834 834
 	private static function skip_adding_values_to_akismet( &$values ) {
835 835
 		$skipped_fields = self::get_akismet_skipped_field_ids( $values );
836 836
 		foreach ( $skipped_fields as $skipped_field ) {
837
-			if ( ! isset( $values['item_meta'][ $skipped_field->id ] ) ) {
837
+			if ( ! isset( $values['item_meta'][$skipped_field->id] ) ) {
838 838
 				continue;
839 839
 			}
840 840
 
841 841
 			if ( self::should_really_skip_field( $skipped_field, $values ) ) {
842
-				unset( $values['item_meta'][ $skipped_field->id ] );
843
-				if ( isset( $values['item_meta']['other'][ $skipped_field->id ] ) ) {
844
-					unset( $values['item_meta']['other'][ $skipped_field->id ] );
842
+				unset( $values['item_meta'][$skipped_field->id] );
843
+				if ( isset( $values['item_meta']['other'][$skipped_field->id] ) ) {
844
+					unset( $values['item_meta']['other'][$skipped_field->id] );
845 845
 				}
846 846
 			}
847 847
 		}
@@ -877,14 +877,14 @@  discard block
 block discarded – undo
877 877
 		}
878 878
 
879 879
 		// If a choice field has Other option, but Other is not selected.
880
-		if ( empty( $values['item_meta']['other'][ $field_data->id ] ) ) {
880
+		if ( empty( $values['item_meta']['other'][$field_data->id] ) ) {
881 881
 			return true;
882 882
 		}
883 883
 
884 884
 		// Check if submitted value is same as one of field option.
885 885
 		foreach ( $field_data->options as $option ) {
886 886
 			$option_value = ! is_array( $option ) ? $option : ( isset( $option['value'] ) ? $option['value'] : '' );
887
-			if ( $values['item_meta']['other'][ $field_data->id ] === $option_value ) {
887
+			if ( $values['item_meta']['other'][$field_data->id] === $option_value ) {
888 888
 				return true;
889 889
 			}
890 890
 		}
@@ -956,7 +956,7 @@  discard block
 block discarded – undo
956 956
 
957 957
 			// Convert name array to string.
958 958
 			if ( isset( $value['first'] ) && isset( $value['last'] ) ) {
959
-				$values['item_meta'][ $field_id ] = trim( implode( ' ', $value ) );
959
+				$values['item_meta'][$field_id] = trim( implode( ' ', $value ) );
960 960
 				$values['name_field_ids'][]       = $field_id;
961 961
 				continue;
962 962
 			}
@@ -977,8 +977,8 @@  discard block
 block discarded – undo
977 977
 						continue;
978 978
 					}
979 979
 
980
-					if ( ! isset( $values['item_meta'][ $subsubindex ] ) ) {
981
-						$values['item_meta'][ $subsubindex ] = array();
980
+					if ( ! isset( $values['item_meta'][$subsubindex] ) ) {
981
+						$values['item_meta'][$subsubindex] = array();
982 982
 					}
983 983
 
984 984
 					// Convert name array to string.
@@ -988,13 +988,13 @@  discard block
 block discarded – undo
988 988
 						$values['name_field_ids'][] = $subsubindex;
989 989
 					}
990 990
 
991
-					if ( is_array( $values['item_meta'][ $subsubindex ] ) ) {
992
-						$values['item_meta'][ $subsubindex ][] = $subsubvalue;
991
+					if ( is_array( $values['item_meta'][$subsubindex] ) ) {
992
+						$values['item_meta'][$subsubindex][] = $subsubvalue;
993 993
 					}
994 994
 				}
995 995
 			}//end foreach
996 996
 
997
-			unset( $values['item_meta'][ $field_id ] );
997
+			unset( $values['item_meta'][$field_id] );
998 998
 		}//end foreach
999 999
 
1000 1000
 		return $form_ids;
Please login to merge, or discard this patch.