Completed
Pull Request — master (#1945)
by
unknown
49s
created
classes/models/FrmEntryValidate.php 1 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
 				}
@@ -659,13 +659,13 @@  discard block
 block discarded – undo
659 659
 	 * @return array
660 660
 	 */
661 661
 	private static function get_name_text_fields( $form_id ) {
662
-		if ( null !== self::$name_text_fields && isset( self::$name_text_fields[ $form_id ] ) ) {
663
-			return self::$name_text_fields[ $form_id ];
662
+		if ( null !== self::$name_text_fields && isset( self::$name_text_fields[$form_id] ) ) {
663
+			return self::$name_text_fields[$form_id];
664 664
 		}
665 665
 		if ( null === self::$name_text_fields ) {
666 666
 			self::$name_text_fields = array();
667 667
 		}
668
-		self::$name_text_fields[ $form_id ] = FrmDb::get_results(
668
+		self::$name_text_fields[$form_id] = FrmDb::get_results(
669 669
 			'frm_fields',
670 670
 			array(
671 671
 				'form_id' => $form_id,
@@ -676,7 +676,7 @@  discard block
 block discarded – undo
676 676
 			array( 'order_by' => 'field_order ASC' )
677 677
 		);
678 678
 
679
-		return self::$name_text_fields[ $form_id ];
679
+		return self::$name_text_fields[$form_id];
680 680
 	}
681 681
 
682 682
 	private static function add_server_values_to_akismet( &$datas ) {
@@ -685,7 +685,7 @@  discard block
 block discarded – undo
685 685
 
686 686
 			// Send any potentially useful $_SERVER vars, but avoid sending junk we don't need.
687 687
 			if ( $include_value ) {
688
-				$datas[ $key ] = $value;
688
+				$datas[$key] = $value;
689 689
 			}
690 690
 			unset( $key, $value );
691 691
 		}
@@ -702,10 +702,10 @@  discard block
 block discarded – undo
702 702
 	private static function add_comment_content_to_akismet( &$datas, $values ) {
703 703
 		if ( isset( $datas['frm_duplicated'] ) ) {
704 704
 			foreach ( $datas['frm_duplicated'] as $index ) {
705
-				if ( isset( $values['item_meta'][ $index ] ) ) {
706
-					unset( $values['item_meta'][ $index ] );
705
+				if ( isset( $values['item_meta'][$index] ) ) {
706
+					unset( $values['item_meta'][$index] );
707 707
 				} else {
708
-					unset( $values[ $index ] );
708
+					unset( $values[$index] );
709 709
 				}
710 710
 			}
711 711
 			unset( $datas['frm_duplicated'] );
@@ -724,14 +724,14 @@  discard block
 block discarded – undo
724 724
 	private static function skip_adding_values_to_akismet( &$values ) {
725 725
 		$skipped_fields = self::get_akismet_skipped_field_ids( $values );
726 726
 		foreach ( $skipped_fields as $skipped_field ) {
727
-			if ( ! isset( $values['item_meta'][ $skipped_field->id ] ) ) {
727
+			if ( ! isset( $values['item_meta'][$skipped_field->id] ) ) {
728 728
 				continue;
729 729
 			}
730 730
 
731 731
 			if ( self::should_really_skip_field( $skipped_field, $values ) ) {
732
-				unset( $values['item_meta'][ $skipped_field->id ] );
733
-				if ( isset( $values['item_meta']['other'][ $skipped_field->id ] ) ) {
734
-					unset( $values['item_meta']['other'][ $skipped_field->id ] );
732
+				unset( $values['item_meta'][$skipped_field->id] );
733
+				if ( isset( $values['item_meta']['other'][$skipped_field->id] ) ) {
734
+					unset( $values['item_meta']['other'][$skipped_field->id] );
735 735
 				}
736 736
 			}
737 737
 		}
@@ -767,14 +767,14 @@  discard block
 block discarded – undo
767 767
 		}
768 768
 
769 769
 		// If a choice field has Other option, but Other is not selected.
770
-		if ( empty( $values['item_meta']['other'][ $field_data->id ] ) ) {
770
+		if ( empty( $values['item_meta']['other'][$field_data->id] ) ) {
771 771
 			return true;
772 772
 		}
773 773
 
774 774
 		// Check if submitted value is same as one of field option.
775 775
 		foreach ( $field_data->options as $option ) {
776 776
 			$option_value = ! is_array( $option ) ? $option : ( isset( $option['value'] ) ? $option['value'] : '' );
777
-			if ( $values['item_meta']['other'][ $field_data->id ] === $option_value ) {
777
+			if ( $values['item_meta']['other'][$field_data->id] === $option_value ) {
778 778
 				return true;
779 779
 			}
780 780
 		}
@@ -845,7 +845,7 @@  discard block
 block discarded – undo
845 845
 
846 846
 			// Convert name array to string.
847 847
 			if ( isset( $value['first'] ) && isset( $value['last'] ) ) {
848
-				$values['item_meta'][ $field_id ] = trim( implode( ' ', $value ) );
848
+				$values['item_meta'][$field_id] = trim( implode( ' ', $value ) );
849 849
 				$values['name_field_ids'][]       = $field_id;
850 850
 				continue;
851 851
 			}
@@ -866,8 +866,8 @@  discard block
 block discarded – undo
866 866
 						continue;
867 867
 					}
868 868
 
869
-					if ( ! isset( $values['item_meta'][ $subsubindex ] ) ) {
870
-						$values['item_meta'][ $subsubindex ] = array();
869
+					if ( ! isset( $values['item_meta'][$subsubindex] ) ) {
870
+						$values['item_meta'][$subsubindex] = array();
871 871
 					}
872 872
 
873 873
 					// Convert name array to string.
@@ -877,11 +877,11 @@  discard block
 block discarded – undo
877 877
 						$values['name_field_ids'][] = $subsubindex;
878 878
 					}
879 879
 
880
-					$values['item_meta'][ $subsubindex ][] = $subsubvalue;
880
+					$values['item_meta'][$subsubindex][] = $subsubvalue;
881 881
 				}
882 882
 			}//end foreach
883 883
 
884
-			unset( $values['item_meta'][ $field_id ] );
884
+			unset( $values['item_meta'][$field_id] );
885 885
 		}//end foreach
886 886
 
887 887
 		return $form_ids;
Please login to merge, or discard this patch.