Completed
Pull Request — master (#2337)
by
unknown
46s
created
classes/models/FrmEntryValidate.php 1 patch
Spacing   +31 added lines, -31 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
 		}
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
 		$values['value'] = $value;
271 271
 		FrmFieldsHelper::prepare_new_front_field( $values, $field_object );
272 272
 
273
-		$map_callback = function ( $option ) {
273
+		$map_callback = function( $option ) {
274 274
 			return is_array( $option ) ? $option['value'] : $option;
275 275
 		};
276 276
 
@@ -338,7 +338,7 @@  discard block
 block discarded – undo
338 338
 			$pattern = self::phone_format( $field );
339 339
 
340 340
 			if ( ! preg_match( $pattern, $value ) ) {
341
-				$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
341
+				$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
342 342
 			}
343 343
 		}
344 344
 	}
@@ -451,7 +451,7 @@  discard block
 block discarded – undo
451 451
 	 */
452 452
 	private static function form_is_in_progress( $values ) {
453 453
 		return FrmAppHelper::pro_is_installed() &&
454
-			( isset( $values[ 'frm_page_order_' . $values['form_id'] ] ) || FrmAppHelper::get_post_param( 'frm_next_page' ) ) &&
454
+			( isset( $values['frm_page_order_' . $values['form_id']] ) || FrmAppHelper::get_post_param( 'frm_next_page' ) ) &&
455 455
 			FrmField::get_all_types_in_form( $values['form_id'], 'break' );
456 456
 	}
457 457
 
@@ -697,9 +697,9 @@  discard block
 block discarded – undo
697 697
 			foreach ( $datas['missing_keys'] as $key_index => $key ) {
698 698
 				$found = self::is_akismet_guest_info_value( $key, $value, $field_id, $datas['name_field_ids'], $values );
699 699
 				if ( $found ) {
700
-					$datas[ $key ]             = $value;
700
+					$datas[$key]             = $value;
701 701
 					$datas['frm_duplicated'][] = $field_id;
702
-					unset( $datas['missing_keys'][ $key_index ] );
702
+					unset( $datas['missing_keys'][$key_index] );
703 703
 				}
704 704
 			}
705 705
 		}//end foreach
@@ -742,11 +742,11 @@  discard block
 block discarded – undo
742 742
 					if ( 'Name' !== $field->name ) {
743 743
 						continue;
744 744
 					}
745
-					if ( isset( $fields[ $index + 1 ] ) && 'Last' === $fields[ $index + 1 ]->name ) {
746
-						if ( empty( $values[ absint( $fields[ $index + 1 ]->id ) ] ) ) {
745
+					if ( isset( $fields[$index + 1] ) && 'Last' === $fields[$index + 1]->name ) {
746
+						if ( empty( $values[absint( $fields[$index + 1]->id )] ) ) {
747 747
 							continue;
748 748
 						}
749
-						$value .= ' ' . $values[ $fields[ $index + 1 ]->id ];
749
+						$value .= ' ' . $values[$fields[$index + 1]->id];
750 750
 						return true;
751 751
 					}
752 752
 				}
@@ -765,13 +765,13 @@  discard block
 block discarded – undo
765 765
 	 */
766 766
 	private static function get_name_text_fields( $form_id ) {
767 767
 		$name_text_fields_is_initialized = is_array( self::$name_text_fields );
768
-		if ( $name_text_fields_is_initialized && isset( self::$name_text_fields[ $form_id ] ) ) {
769
-			return self::$name_text_fields[ $form_id ];
768
+		if ( $name_text_fields_is_initialized && isset( self::$name_text_fields[$form_id] ) ) {
769
+			return self::$name_text_fields[$form_id];
770 770
 		}
771 771
 		if ( ! $name_text_fields_is_initialized ) {
772 772
 			self::$name_text_fields = array();
773 773
 		}
774
-		self::$name_text_fields[ $form_id ] = FrmDb::get_results(
774
+		self::$name_text_fields[$form_id] = FrmDb::get_results(
775 775
 			'frm_fields',
776 776
 			array(
777 777
 				'form_id' => $form_id,
@@ -782,7 +782,7 @@  discard block
 block discarded – undo
782 782
 			array( 'order_by' => 'field_order ASC' )
783 783
 		);
784 784
 
785
-		return self::$name_text_fields[ $form_id ];
785
+		return self::$name_text_fields[$form_id];
786 786
 	}
787 787
 
788 788
 	private static function add_server_values_to_akismet( &$datas ) {
@@ -791,7 +791,7 @@  discard block
 block discarded – undo
791 791
 
792 792
 			// Send any potentially useful $_SERVER vars, but avoid sending junk we don't need.
793 793
 			if ( $include_value ) {
794
-				$datas[ $key ] = $value;
794
+				$datas[$key] = $value;
795 795
 			}
796 796
 			unset( $key, $value );
797 797
 		}
@@ -808,10 +808,10 @@  discard block
 block discarded – undo
808 808
 	private static function add_comment_content_to_akismet( &$datas, $values ) {
809 809
 		if ( isset( $datas['frm_duplicated'] ) ) {
810 810
 			foreach ( $datas['frm_duplicated'] as $index ) {
811
-				if ( isset( $values['item_meta'][ $index ] ) ) {
812
-					unset( $values['item_meta'][ $index ] );
811
+				if ( isset( $values['item_meta'][$index] ) ) {
812
+					unset( $values['item_meta'][$index] );
813 813
 				} else {
814
-					unset( $values[ $index ] );
814
+					unset( $values[$index] );
815 815
 				}
816 816
 			}
817 817
 			unset( $datas['frm_duplicated'] );
@@ -830,14 +830,14 @@  discard block
 block discarded – undo
830 830
 	private static function skip_adding_values_to_akismet( &$values ) {
831 831
 		$skipped_fields = self::get_akismet_skipped_field_ids( $values );
832 832
 		foreach ( $skipped_fields as $skipped_field ) {
833
-			if ( ! isset( $values['item_meta'][ $skipped_field->id ] ) ) {
833
+			if ( ! isset( $values['item_meta'][$skipped_field->id] ) ) {
834 834
 				continue;
835 835
 			}
836 836
 
837 837
 			if ( self::should_really_skip_field( $skipped_field, $values ) ) {
838
-				unset( $values['item_meta'][ $skipped_field->id ] );
839
-				if ( isset( $values['item_meta']['other'][ $skipped_field->id ] ) ) {
840
-					unset( $values['item_meta']['other'][ $skipped_field->id ] );
838
+				unset( $values['item_meta'][$skipped_field->id] );
839
+				if ( isset( $values['item_meta']['other'][$skipped_field->id] ) ) {
840
+					unset( $values['item_meta']['other'][$skipped_field->id] );
841 841
 				}
842 842
 			}
843 843
 		}
@@ -873,14 +873,14 @@  discard block
 block discarded – undo
873 873
 		}
874 874
 
875 875
 		// If a choice field has Other option, but Other is not selected.
876
-		if ( empty( $values['item_meta']['other'][ $field_data->id ] ) ) {
876
+		if ( empty( $values['item_meta']['other'][$field_data->id] ) ) {
877 877
 			return true;
878 878
 		}
879 879
 
880 880
 		// Check if submitted value is same as one of field option.
881 881
 		foreach ( $field_data->options as $option ) {
882 882
 			$option_value = ! is_array( $option ) ? $option : ( isset( $option['value'] ) ? $option['value'] : '' );
883
-			if ( $values['item_meta']['other'][ $field_data->id ] === $option_value ) {
883
+			if ( $values['item_meta']['other'][$field_data->id] === $option_value ) {
884 884
 				return true;
885 885
 			}
886 886
 		}
@@ -951,7 +951,7 @@  discard block
 block discarded – undo
951 951
 
952 952
 			// Convert name array to string.
953 953
 			if ( isset( $value['first'] ) && isset( $value['last'] ) ) {
954
-				$values['item_meta'][ $field_id ] = trim( implode( ' ', $value ) );
954
+				$values['item_meta'][$field_id] = trim( implode( ' ', $value ) );
955 955
 				$values['name_field_ids'][]       = $field_id;
956 956
 				continue;
957 957
 			}
@@ -972,8 +972,8 @@  discard block
 block discarded – undo
972 972
 						continue;
973 973
 					}
974 974
 
975
-					if ( ! isset( $values['item_meta'][ $subsubindex ] ) ) {
976
-						$values['item_meta'][ $subsubindex ] = array();
975
+					if ( ! isset( $values['item_meta'][$subsubindex] ) ) {
976
+						$values['item_meta'][$subsubindex] = array();
977 977
 					}
978 978
 
979 979
 					// Convert name array to string.
@@ -983,13 +983,13 @@  discard block
 block discarded – undo
983 983
 						$values['name_field_ids'][] = $subsubindex;
984 984
 					}
985 985
 
986
-					if ( is_array( $values['item_meta'][ $subsubindex ] ) ) {
987
-						$values['item_meta'][ $subsubindex ][] = $subsubvalue;
986
+					if ( is_array( $values['item_meta'][$subsubindex] ) ) {
987
+						$values['item_meta'][$subsubindex][] = $subsubvalue;
988 988
 					}
989 989
 				}
990 990
 			}//end foreach
991 991
 
992
-			unset( $values['item_meta'][ $field_id ] );
992
+			unset( $values['item_meta'][$field_id] );
993 993
 		}//end foreach
994 994
 
995 995
 		return $form_ids;
Please login to merge, or discard this patch.