Completed
Pull Request — master (#2285)
by
unknown
01:02
created
classes/models/FrmValidate.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
 
50 50
 		$form = $this->get_form();
51 51
 		$key  = $this->get_option_key();
52
-		return ! empty( $form->options[ $key ] ) && 'off' !== $form->options[ $key ];
52
+		return ! empty( $form->options[$key] ) && 'off' !== $form->options[$key];
53 53
 	}
54 54
 
55 55
 	/**
Please login to merge, or discard this patch.
classes/models/FrmStopforumspam.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 
33 33
 	private function is_spam() {
34 34
 		$ip_address   = FrmAppHelper::get_ip_address();
35
-		$ips_to_allow = array( '', '127.0.0.1'  );
35
+		$ips_to_allow = array( '', '127.0.0.1' );
36 36
 		$request_data = array();
37 37
 
38 38
 		if ( ! in_array( $ip_address, $ips_to_allow, true ) ) {
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 	}
74 74
 
75 75
 	private function add_email_to_request( &$request_data ) {
76
-		$email = $this->values['item_meta'][ $this->posted_fields['email'] ];
76
+		$email = $this->values['item_meta'][$this->posted_fields['email']];
77 77
 		if ( is_email( $email ) ) {
78 78
 			$request_data['email'] = $email;
79 79
 		}
Please login to merge, or discard this patch.
classes/models/FrmHoneypot.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -208,7 +208,7 @@
 block discarded – undo
208 208
 			return '';
209 209
 		}
210 210
 
211
-		return isset( $item_meta[ $field_id ] ) ? $item_meta[ $field_id ] : '';
211
+		return isset( $item_meta[$field_id] ) ? $item_meta[$field_id] : '';
212 212
 	}
213 213
 
214 214
 	/**
Please login to merge, or discard this patch.
classes/models/FrmSettings.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -227,8 +227,8 @@  discard block
 block discarded – undo
227 227
 		}
228 228
 
229 229
 		foreach ( $settings as $setting => $default ) {
230
-			if ( isset( $params[ 'frm_' . $setting ] ) ) {
231
-				$this->{$setting} = $params[ 'frm_' . $setting ];
230
+			if ( isset( $params['frm_' . $setting] ) ) {
231
+				$this->{$setting} = $params['frm_' . $setting];
232 232
 			} elseif ( ! isset( $this->{$setting} ) ) {
233 233
 				$this->{$setting} = $default;
234 234
 			}
@@ -418,7 +418,7 @@  discard block
 block discarded – undo
418 418
 			'honeypot',
419 419
 		);
420 420
 		foreach ( $checkboxes as $set ) {
421
-			$this->$set = isset( $params[ 'frm_' . $set ] ) ? absint( $params[ 'frm_' . $set ] ) : 0;
421
+			$this->$set = isset( $params['frm_' . $set] ) ? absint( $params['frm_' . $set] ) : 0;
422 422
 		}
423 423
 	}
424 424
 
@@ -431,7 +431,7 @@  discard block
 block discarded – undo
431 431
 		$frm_roles = FrmAppHelper::frm_capabilities();
432 432
 		$roles     = get_editable_roles();
433 433
 		foreach ( $frm_roles as $frm_role => $frm_role_description ) {
434
-			$this->$frm_role = (array) ( isset( $params[ $frm_role ] ) ? $params[ $frm_role ] : 'administrator' );
434
+			$this->$frm_role = (array) ( isset( $params[$frm_role] ) ? $params[$frm_role] : 'administrator' );
435 435
 
436 436
 			// Make sure administrators always have permissions
437 437
 			if ( ! in_array( 'administrator', $this->$frm_role, true ) ) {
Please login to merge, or discard this patch.
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
 	}
@@ -358,7 +358,7 @@  discard block
 block discarded – undo
358 358
 	 */
359 359
 	private static function form_is_in_progress( $values ) {
360 360
 		return FrmAppHelper::pro_is_installed() &&
361
-			( isset( $values[ 'frm_page_order_' . $values['form_id'] ] ) || FrmAppHelper::get_post_param( 'frm_next_page' ) ) &&
361
+			( isset( $values['frm_page_order_' . $values['form_id']] ) || FrmAppHelper::get_post_param( 'frm_next_page' ) ) &&
362 362
 			FrmField::get_all_types_in_form( $values['form_id'], 'break' );
363 363
 	}
364 364
 
@@ -389,7 +389,7 @@  discard block
 block discarded – undo
389 389
 	}
390 390
 
391 391
 	private static function is_blacklist_spam( $values ) {
392
-		$check = new FrmBlacklistSpamCheck( $values['form_id'] );;
392
+		$check = new FrmBlacklistSpamCheck( $values['form_id'] ); ;
393 393
 		$check->set_values( $values );
394 394
 		return ! $check->validate();
395 395
 	}
@@ -617,9 +617,9 @@  discard block
 block discarded – undo
617 617
 			foreach ( $datas['missing_keys'] as $key_index => $key ) {
618 618
 				$found = self::is_akismet_guest_info_value( $key, $value, $field_id, $datas['name_field_ids'], $values );
619 619
 				if ( $found ) {
620
-					$datas[ $key ]             = $value;
620
+					$datas[$key]             = $value;
621 621
 					$datas['frm_duplicated'][] = $field_id;
622
-					unset( $datas['missing_keys'][ $key_index ] );
622
+					unset( $datas['missing_keys'][$key_index] );
623 623
 				}
624 624
 			}
625 625
 		}//end foreach
@@ -662,11 +662,11 @@  discard block
 block discarded – undo
662 662
 					if ( 'Name' !== $field->name ) {
663 663
 						continue;
664 664
 					}
665
-					if ( isset( $fields[ $index + 1 ] ) && 'Last' === $fields[ $index + 1 ]->name ) {
666
-						if ( empty( $values[ absint( $fields[ $index + 1 ]->id ) ] ) ) {
665
+					if ( isset( $fields[$index + 1] ) && 'Last' === $fields[$index + 1]->name ) {
666
+						if ( empty( $values[absint( $fields[$index + 1]->id )] ) ) {
667 667
 							continue;
668 668
 						}
669
-						$value .= ' ' . $values[ $fields[ $index + 1 ]->id ];
669
+						$value .= ' ' . $values[$fields[$index + 1]->id];
670 670
 						return true;
671 671
 					}
672 672
 				}
@@ -685,13 +685,13 @@  discard block
 block discarded – undo
685 685
 	 */
686 686
 	private static function get_name_text_fields( $form_id ) {
687 687
 		$name_text_fields_is_initialized = is_array( self::$name_text_fields );
688
-		if ( $name_text_fields_is_initialized && isset( self::$name_text_fields[ $form_id ] ) ) {
689
-			return self::$name_text_fields[ $form_id ];
688
+		if ( $name_text_fields_is_initialized && isset( self::$name_text_fields[$form_id] ) ) {
689
+			return self::$name_text_fields[$form_id];
690 690
 		}
691 691
 		if ( ! $name_text_fields_is_initialized ) {
692 692
 			self::$name_text_fields = array();
693 693
 		}
694
-		self::$name_text_fields[ $form_id ] = FrmDb::get_results(
694
+		self::$name_text_fields[$form_id] = FrmDb::get_results(
695 695
 			'frm_fields',
696 696
 			array(
697 697
 				'form_id' => $form_id,
@@ -702,7 +702,7 @@  discard block
 block discarded – undo
702 702
 			array( 'order_by' => 'field_order ASC' )
703 703
 		);
704 704
 
705
-		return self::$name_text_fields[ $form_id ];
705
+		return self::$name_text_fields[$form_id];
706 706
 	}
707 707
 
708 708
 	private static function add_server_values_to_akismet( &$datas ) {
@@ -711,7 +711,7 @@  discard block
 block discarded – undo
711 711
 
712 712
 			// Send any potentially useful $_SERVER vars, but avoid sending junk we don't need.
713 713
 			if ( $include_value ) {
714
-				$datas[ $key ] = $value;
714
+				$datas[$key] = $value;
715 715
 			}
716 716
 			unset( $key, $value );
717 717
 		}
@@ -728,10 +728,10 @@  discard block
 block discarded – undo
728 728
 	private static function add_comment_content_to_akismet( &$datas, $values ) {
729 729
 		if ( isset( $datas['frm_duplicated'] ) ) {
730 730
 			foreach ( $datas['frm_duplicated'] as $index ) {
731
-				if ( isset( $values['item_meta'][ $index ] ) ) {
732
-					unset( $values['item_meta'][ $index ] );
731
+				if ( isset( $values['item_meta'][$index] ) ) {
732
+					unset( $values['item_meta'][$index] );
733 733
 				} else {
734
-					unset( $values[ $index ] );
734
+					unset( $values[$index] );
735 735
 				}
736 736
 			}
737 737
 			unset( $datas['frm_duplicated'] );
@@ -750,14 +750,14 @@  discard block
 block discarded – undo
750 750
 	private static function skip_adding_values_to_akismet( &$values ) {
751 751
 		$skipped_fields = self::get_akismet_skipped_field_ids( $values );
752 752
 		foreach ( $skipped_fields as $skipped_field ) {
753
-			if ( ! isset( $values['item_meta'][ $skipped_field->id ] ) ) {
753
+			if ( ! isset( $values['item_meta'][$skipped_field->id] ) ) {
754 754
 				continue;
755 755
 			}
756 756
 
757 757
 			if ( self::should_really_skip_field( $skipped_field, $values ) ) {
758
-				unset( $values['item_meta'][ $skipped_field->id ] );
759
-				if ( isset( $values['item_meta']['other'][ $skipped_field->id ] ) ) {
760
-					unset( $values['item_meta']['other'][ $skipped_field->id ] );
758
+				unset( $values['item_meta'][$skipped_field->id] );
759
+				if ( isset( $values['item_meta']['other'][$skipped_field->id] ) ) {
760
+					unset( $values['item_meta']['other'][$skipped_field->id] );
761 761
 				}
762 762
 			}
763 763
 		}
@@ -793,14 +793,14 @@  discard block
 block discarded – undo
793 793
 		}
794 794
 
795 795
 		// If a choice field has Other option, but Other is not selected.
796
-		if ( empty( $values['item_meta']['other'][ $field_data->id ] ) ) {
796
+		if ( empty( $values['item_meta']['other'][$field_data->id] ) ) {
797 797
 			return true;
798 798
 		}
799 799
 
800 800
 		// Check if submitted value is same as one of field option.
801 801
 		foreach ( $field_data->options as $option ) {
802 802
 			$option_value = ! is_array( $option ) ? $option : ( isset( $option['value'] ) ? $option['value'] : '' );
803
-			if ( $values['item_meta']['other'][ $field_data->id ] === $option_value ) {
803
+			if ( $values['item_meta']['other'][$field_data->id] === $option_value ) {
804 804
 				return true;
805 805
 			}
806 806
 		}
@@ -871,7 +871,7 @@  discard block
 block discarded – undo
871 871
 
872 872
 			// Convert name array to string.
873 873
 			if ( isset( $value['first'] ) && isset( $value['last'] ) ) {
874
-				$values['item_meta'][ $field_id ] = trim( implode( ' ', $value ) );
874
+				$values['item_meta'][$field_id] = trim( implode( ' ', $value ) );
875 875
 				$values['name_field_ids'][]       = $field_id;
876 876
 				continue;
877 877
 			}
@@ -892,8 +892,8 @@  discard block
 block discarded – undo
892 892
 						continue;
893 893
 					}
894 894
 
895
-					if ( ! isset( $values['item_meta'][ $subsubindex ] ) ) {
896
-						$values['item_meta'][ $subsubindex ] = array();
895
+					if ( ! isset( $values['item_meta'][$subsubindex] ) ) {
896
+						$values['item_meta'][$subsubindex] = array();
897 897
 					}
898 898
 
899 899
 					// Convert name array to string.
@@ -903,11 +903,11 @@  discard block
 block discarded – undo
903 903
 						$values['name_field_ids'][] = $subsubindex;
904 904
 					}
905 905
 
906
-					$values['item_meta'][ $subsubindex ][] = $subsubvalue;
906
+					$values['item_meta'][$subsubindex][] = $subsubvalue;
907 907
 				}
908 908
 			}//end foreach
909 909
 
910
-			unset( $values['item_meta'][ $field_id ] );
910
+			unset( $values['item_meta'][$field_id] );
911 911
 		}//end foreach
912 912
 
913 913
 		return $form_ids;
Please login to merge, or discard this patch.