Completed
Pull Request — master (#1945)
by
unknown
42s
created
classes/models/FrmEntryValidate.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 			return $errors;
21 21
 		}
22 22
 
23
-		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' ) ) ) {
23
+		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' ) ) ) {
24 24
 			$frm_settings   = FrmAppHelper::get_settings();
25 25
 			$errors['form'] = $frm_settings->admin_permission;
26 26
 		}
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 		$args = wp_parse_args( $args, $defaults );
124 124
 
125 125
 		if ( empty( $args['parent_field_id'] ) ) {
126
-			$value = isset( $values['item_meta'][ $args['id'] ] ) ? $values['item_meta'][ $args['id'] ] : '';
126
+			$value = isset( $values['item_meta'][$args['id']] ) ? $values['item_meta'][$args['id']] : '';
127 127
 		} else {
128 128
 			// value is from a nested form
129 129
 			$value = $values;
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
 		}
145 145
 
146 146
 		if ( $posted_field->required == '1' && FrmAppHelper::is_empty_value( $value ) ) {
147
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $posted_field, 'blank' );
147
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $posted_field, 'blank' );
148 148
 		} elseif ( ! isset( $_POST['item_name'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
149 149
 			self::maybe_add_item_name( $value, $posted_field );
150 150
 		}
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 			$pattern = self::phone_format( $field );
227 227
 
228 228
 			if ( ! preg_match( $pattern, $value ) ) {
229
-				$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
229
+				$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
230 230
 			}
231 231
 		}
232 232
 	}
@@ -339,7 +339,7 @@  discard block
 block discarded – undo
339 339
 	 */
340 340
 	private static function form_is_in_progress( $values ) {
341 341
 		return FrmAppHelper::pro_is_installed() &&
342
-			( isset( $values[ 'frm_page_order_' . $values['form_id'] ] ) || FrmAppHelper::get_post_param( 'frm_next_page' ) ) &&
342
+			( isset( $values['frm_page_order_' . $values['form_id']] ) || FrmAppHelper::get_post_param( 'frm_next_page' ) ) &&
343 343
 			FrmField::get_all_types_in_form( $values['form_id'], 'break' );
344 344
 	}
345 345
 
@@ -585,9 +585,9 @@  discard block
 block discarded – undo
585 585
 			foreach ( $datas['missing_keys'] as $key_index => $key ) {
586 586
 				$found = self::is_akismet_guest_info_value( $key, $value, $field_id, $datas['name_field_ids'], $values );
587 587
 				if ( $found ) {
588
-					$datas[ $key ]             = $value;
588
+					$datas[$key]             = $value;
589 589
 					$datas['frm_duplicated'][] = $field_id;
590
-					unset( $datas['missing_keys'][ $key_index ] );
590
+					unset( $datas['missing_keys'][$key_index] );
591 591
 				}
592 592
 			}
593 593
 		}//end foreach
@@ -629,11 +629,11 @@  discard block
 block discarded – undo
629 629
 					if ( 'Name' !== $field->name ) {
630 630
 						continue;
631 631
 					}
632
-					if ( isset( $fields[ $index + 1 ] ) && 'Last' === $fields[ $index + 1 ]->name ) {
633
-						if ( empty( $values[ absint( $fields[ $index + 1 ]->id ) ] ) ) {
632
+					if ( isset( $fields[$index + 1] ) && 'Last' === $fields[$index + 1]->name ) {
633
+						if ( empty( $values[absint( $fields[$index + 1]->id )] ) ) {
634 634
 							continue;
635 635
 						}
636
-						$value .= ' ' . $values[ $fields[ $index + 1 ]->id ];
636
+						$value .= ' ' . $values[$fields[$index + 1]->id];
637 637
 						return true;
638 638
 					}
639 639
 				}
@@ -648,7 +648,7 @@  discard block
 block discarded – undo
648 648
 
649 649
 			// Send any potentially useful $_SERVER vars, but avoid sending junk we don't need.
650 650
 			if ( $include_value ) {
651
-				$datas[ $key ] = $value;
651
+				$datas[$key] = $value;
652 652
 			}
653 653
 			unset( $key, $value );
654 654
 		}
@@ -665,10 +665,10 @@  discard block
 block discarded – undo
665 665
 	private static function add_comment_content_to_akismet( &$datas, $values ) {
666 666
 		if ( isset( $datas['frm_duplicated'] ) ) {
667 667
 			foreach ( $datas['frm_duplicated'] as $index ) {
668
-				if ( isset( $values['item_meta'][ $index ] ) ) {
669
-					unset( $values['item_meta'][ $index ] );
668
+				if ( isset( $values['item_meta'][$index] ) ) {
669
+					unset( $values['item_meta'][$index] );
670 670
 				} else {
671
-					unset( $values[ $index ] );
671
+					unset( $values[$index] );
672 672
 				}
673 673
 			}
674 674
 			unset( $datas['frm_duplicated'] );
@@ -687,14 +687,14 @@  discard block
 block discarded – undo
687 687
 	private static function skip_adding_values_to_akismet( &$values ) {
688 688
 		$skipped_fields = self::get_akismet_skipped_field_ids( $values );
689 689
 		foreach ( $skipped_fields as $skipped_field ) {
690
-			if ( ! isset( $values['item_meta'][ $skipped_field->id ] ) ) {
690
+			if ( ! isset( $values['item_meta'][$skipped_field->id] ) ) {
691 691
 				continue;
692 692
 			}
693 693
 
694 694
 			if ( self::should_really_skip_field( $skipped_field, $values ) ) {
695
-				unset( $values['item_meta'][ $skipped_field->id ] );
696
-				if ( isset( $values['item_meta']['other'][ $skipped_field->id ] ) ) {
697
-					unset( $values['item_meta']['other'][ $skipped_field->id ] );
695
+				unset( $values['item_meta'][$skipped_field->id] );
696
+				if ( isset( $values['item_meta']['other'][$skipped_field->id] ) ) {
697
+					unset( $values['item_meta']['other'][$skipped_field->id] );
698 698
 				}
699 699
 			}
700 700
 		}
@@ -730,14 +730,14 @@  discard block
 block discarded – undo
730 730
 		}
731 731
 
732 732
 		// If a choice field has Other option, but Other is not selected.
733
-		if ( empty( $values['item_meta']['other'][ $field_data->id ] ) ) {
733
+		if ( empty( $values['item_meta']['other'][$field_data->id] ) ) {
734 734
 			return true;
735 735
 		}
736 736
 
737 737
 		// Check if submitted value is same as one of field option.
738 738
 		foreach ( $field_data->options as $option ) {
739 739
 			$option_value = ! is_array( $option ) ? $option : ( isset( $option['value'] ) ? $option['value'] : '' );
740
-			if ( $values['item_meta']['other'][ $field_data->id ] === $option_value ) {
740
+			if ( $values['item_meta']['other'][$field_data->id] === $option_value ) {
741 741
 				return true;
742 742
 			}
743 743
 		}
@@ -808,7 +808,7 @@  discard block
 block discarded – undo
808 808
 
809 809
 			// Convert name array to string.
810 810
 			if ( isset( $value['first'] ) && isset( $value['last'] ) ) {
811
-				$values['item_meta'][ $field_id ] = trim( implode( ' ', $value ) );
811
+				$values['item_meta'][$field_id] = trim( implode( ' ', $value ) );
812 812
 				$values['name_field_ids'][]       = $field_id;
813 813
 				continue;
814 814
 			}
@@ -829,8 +829,8 @@  discard block
 block discarded – undo
829 829
 						continue;
830 830
 					}
831 831
 
832
-					if ( ! isset( $values['item_meta'][ $subsubindex ] ) ) {
833
-						$values['item_meta'][ $subsubindex ] = array();
832
+					if ( ! isset( $values['item_meta'][$subsubindex] ) ) {
833
+						$values['item_meta'][$subsubindex] = array();
834 834
 					}
835 835
 
836 836
 					// Convert name array to string.
@@ -840,11 +840,11 @@  discard block
 block discarded – undo
840 840
 						$values['name_field_ids'][] = $subsubindex;
841 841
 					}
842 842
 
843
-					$values['item_meta'][ $subsubindex ][] = $subsubvalue;
843
+					$values['item_meta'][$subsubindex][] = $subsubvalue;
844 844
 				}
845 845
 			}//end foreach
846 846
 
847
-			unset( $values['item_meta'][ $field_id ] );
847
+			unset( $values['item_meta'][$field_id] );
848 848
 		}//end foreach
849 849
 
850 850
 		return $form_ids;
Please login to merge, or discard this patch.