Completed
Pull Request — master (#2312)
by
unknown
01:03 queued 11s
created
classes/models/FrmEntryValidate.php 1 patch
Spacing   +30 added lines, -30 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
 		}
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
 			$pattern = self::phone_format( $field );
235 235
 
236 236
 			if ( ! preg_match( $pattern, $value ) ) {
237
-				$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
237
+				$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
238 238
 			}
239 239
 		}
240 240
 	}
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
347 347
 	 */
348 348
 	private static function form_is_in_progress( $values ) {
349 349
 		return FrmAppHelper::pro_is_installed() &&
350
-			( isset( $values[ 'frm_page_order_' . $values['form_id'] ] ) || FrmAppHelper::get_post_param( 'frm_next_page' ) ) &&
350
+			( isset( $values['frm_page_order_' . $values['form_id']] ) || FrmAppHelper::get_post_param( 'frm_next_page' ) ) &&
351 351
 			FrmField::get_all_types_in_form( $values['form_id'], 'break' );
352 352
 	}
353 353
 
@@ -593,9 +593,9 @@  discard block
 block discarded – undo
593 593
 			foreach ( $datas['missing_keys'] as $key_index => $key ) {
594 594
 				$found = self::is_akismet_guest_info_value( $key, $value, $field_id, $datas['name_field_ids'], $values );
595 595
 				if ( $found ) {
596
-					$datas[ $key ]             = $value;
596
+					$datas[$key]             = $value;
597 597
 					$datas['frm_duplicated'][] = $field_id;
598
-					unset( $datas['missing_keys'][ $key_index ] );
598
+					unset( $datas['missing_keys'][$key_index] );
599 599
 				}
600 600
 			}
601 601
 		}//end foreach
@@ -638,11 +638,11 @@  discard block
 block discarded – undo
638 638
 					if ( 'Name' !== $field->name ) {
639 639
 						continue;
640 640
 					}
641
-					if ( isset( $fields[ $index + 1 ] ) && 'Last' === $fields[ $index + 1 ]->name ) {
642
-						if ( empty( $values[ absint( $fields[ $index + 1 ]->id ) ] ) ) {
641
+					if ( isset( $fields[$index + 1] ) && 'Last' === $fields[$index + 1]->name ) {
642
+						if ( empty( $values[absint( $fields[$index + 1]->id )] ) ) {
643 643
 							continue;
644 644
 						}
645
-						$value .= ' ' . $values[ $fields[ $index + 1 ]->id ];
645
+						$value .= ' ' . $values[$fields[$index + 1]->id];
646 646
 						return true;
647 647
 					}
648 648
 				}
@@ -661,13 +661,13 @@  discard block
 block discarded – undo
661 661
 	 */
662 662
 	private static function get_name_text_fields( $form_id ) {
663 663
 		$name_text_fields_is_initialized = is_array( self::$name_text_fields );
664
-		if ( $name_text_fields_is_initialized && isset( self::$name_text_fields[ $form_id ] ) ) {
665
-			return self::$name_text_fields[ $form_id ];
664
+		if ( $name_text_fields_is_initialized && isset( self::$name_text_fields[$form_id] ) ) {
665
+			return self::$name_text_fields[$form_id];
666 666
 		}
667 667
 		if ( ! $name_text_fields_is_initialized ) {
668 668
 			self::$name_text_fields = array();
669 669
 		}
670
-		self::$name_text_fields[ $form_id ] = FrmDb::get_results(
670
+		self::$name_text_fields[$form_id] = FrmDb::get_results(
671 671
 			'frm_fields',
672 672
 			array(
673 673
 				'form_id' => $form_id,
@@ -678,7 +678,7 @@  discard block
 block discarded – undo
678 678
 			array( 'order_by' => 'field_order ASC' )
679 679
 		);
680 680
 
681
-		return self::$name_text_fields[ $form_id ];
681
+		return self::$name_text_fields[$form_id];
682 682
 	}
683 683
 
684 684
 	private static function add_server_values_to_akismet( &$datas ) {
@@ -687,7 +687,7 @@  discard block
 block discarded – undo
687 687
 
688 688
 			// Send any potentially useful $_SERVER vars, but avoid sending junk we don't need.
689 689
 			if ( $include_value ) {
690
-				$datas[ $key ] = $value;
690
+				$datas[$key] = $value;
691 691
 			}
692 692
 			unset( $key, $value );
693 693
 		}
@@ -704,10 +704,10 @@  discard block
 block discarded – undo
704 704
 	private static function add_comment_content_to_akismet( &$datas, $values ) {
705 705
 		if ( isset( $datas['frm_duplicated'] ) ) {
706 706
 			foreach ( $datas['frm_duplicated'] as $index ) {
707
-				if ( isset( $values['item_meta'][ $index ] ) ) {
708
-					unset( $values['item_meta'][ $index ] );
707
+				if ( isset( $values['item_meta'][$index] ) ) {
708
+					unset( $values['item_meta'][$index] );
709 709
 				} else {
710
-					unset( $values[ $index ] );
710
+					unset( $values[$index] );
711 711
 				}
712 712
 			}
713 713
 			unset( $datas['frm_duplicated'] );
@@ -726,14 +726,14 @@  discard block
 block discarded – undo
726 726
 	private static function skip_adding_values_to_akismet( &$values ) {
727 727
 		$skipped_fields = self::get_akismet_skipped_field_ids( $values );
728 728
 		foreach ( $skipped_fields as $skipped_field ) {
729
-			if ( ! isset( $values['item_meta'][ $skipped_field->id ] ) ) {
729
+			if ( ! isset( $values['item_meta'][$skipped_field->id] ) ) {
730 730
 				continue;
731 731
 			}
732 732
 
733 733
 			if ( self::should_really_skip_field( $skipped_field, $values ) ) {
734
-				unset( $values['item_meta'][ $skipped_field->id ] );
735
-				if ( isset( $values['item_meta']['other'][ $skipped_field->id ] ) ) {
736
-					unset( $values['item_meta']['other'][ $skipped_field->id ] );
734
+				unset( $values['item_meta'][$skipped_field->id] );
735
+				if ( isset( $values['item_meta']['other'][$skipped_field->id] ) ) {
736
+					unset( $values['item_meta']['other'][$skipped_field->id] );
737 737
 				}
738 738
 			}
739 739
 		}
@@ -769,14 +769,14 @@  discard block
 block discarded – undo
769 769
 		}
770 770
 
771 771
 		// If a choice field has Other option, but Other is not selected.
772
-		if ( empty( $values['item_meta']['other'][ $field_data->id ] ) ) {
772
+		if ( empty( $values['item_meta']['other'][$field_data->id] ) ) {
773 773
 			return true;
774 774
 		}
775 775
 
776 776
 		// Check if submitted value is same as one of field option.
777 777
 		foreach ( $field_data->options as $option ) {
778 778
 			$option_value = ! is_array( $option ) ? $option : ( isset( $option['value'] ) ? $option['value'] : '' );
779
-			if ( $values['item_meta']['other'][ $field_data->id ] === $option_value ) {
779
+			if ( $values['item_meta']['other'][$field_data->id] === $option_value ) {
780 780
 				return true;
781 781
 			}
782 782
 		}
@@ -847,7 +847,7 @@  discard block
 block discarded – undo
847 847
 
848 848
 			// Convert name array to string.
849 849
 			if ( isset( $value['first'] ) && isset( $value['last'] ) ) {
850
-				$values['item_meta'][ $field_id ] = trim( implode( ' ', $value ) );
850
+				$values['item_meta'][$field_id] = trim( implode( ' ', $value ) );
851 851
 				$values['name_field_ids'][]       = $field_id;
852 852
 				continue;
853 853
 			}
@@ -868,8 +868,8 @@  discard block
 block discarded – undo
868 868
 						continue;
869 869
 					}
870 870
 
871
-					if ( ! isset( $values['item_meta'][ $subsubindex ] ) ) {
872
-						$values['item_meta'][ $subsubindex ] = array();
871
+					if ( ! isset( $values['item_meta'][$subsubindex] ) ) {
872
+						$values['item_meta'][$subsubindex] = array();
873 873
 					}
874 874
 
875 875
 					// Convert name array to string.
@@ -879,13 +879,13 @@  discard block
 block discarded – undo
879 879
 						$values['name_field_ids'][] = $subsubindex;
880 880
 					}
881 881
 
882
-					if ( is_array( $values['item_meta'][ $subsubindex ] ) ) {
883
-						$values['item_meta'][ $subsubindex ][] = $subsubvalue;
882
+					if ( is_array( $values['item_meta'][$subsubindex] ) ) {
883
+						$values['item_meta'][$subsubindex][] = $subsubvalue;
884 884
 					}
885 885
 				}
886 886
 			}//end foreach
887 887
 
888
-			unset( $values['item_meta'][ $field_id ] );
888
+			unset( $values['item_meta'][$field_id] );
889 889
 		}//end foreach
890 890
 
891 891
 		return $form_ids;
Please login to merge, or discard this patch.