Completed
Pull Request — master (#2285)
by
unknown
40s
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/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
 
@@ -418,7 +418,7 @@  discard block
 block discarded – undo
418 418
 	}
419 419
 
420 420
 	public static function blacklist_check( $values ) {
421
-		$check = new FrmBlacklistSpamCheck( $values['form_id'] );;
421
+		$check = new FrmBlacklistSpamCheck( $values['form_id'] ); ;
422 422
 		$check->set_values( $values );
423 423
 		return ! $check->validate();
424 424
 
@@ -600,9 +600,9 @@  discard block
 block discarded – undo
600 600
 			foreach ( $datas['missing_keys'] as $key_index => $key ) {
601 601
 				$found = self::is_akismet_guest_info_value( $key, $value, $field_id, $datas['name_field_ids'], $values );
602 602
 				if ( $found ) {
603
-					$datas[ $key ]             = $value;
603
+					$datas[$key]             = $value;
604 604
 					$datas['frm_duplicated'][] = $field_id;
605
-					unset( $datas['missing_keys'][ $key_index ] );
605
+					unset( $datas['missing_keys'][$key_index] );
606 606
 				}
607 607
 			}
608 608
 		}//end foreach
@@ -645,11 +645,11 @@  discard block
 block discarded – undo
645 645
 					if ( 'Name' !== $field->name ) {
646 646
 						continue;
647 647
 					}
648
-					if ( isset( $fields[ $index + 1 ] ) && 'Last' === $fields[ $index + 1 ]->name ) {
649
-						if ( empty( $values[ absint( $fields[ $index + 1 ]->id ) ] ) ) {
648
+					if ( isset( $fields[$index + 1] ) && 'Last' === $fields[$index + 1]->name ) {
649
+						if ( empty( $values[absint( $fields[$index + 1]->id )] ) ) {
650 650
 							continue;
651 651
 						}
652
-						$value .= ' ' . $values[ $fields[ $index + 1 ]->id ];
652
+						$value .= ' ' . $values[$fields[$index + 1]->id];
653 653
 						return true;
654 654
 					}
655 655
 				}
@@ -668,13 +668,13 @@  discard block
 block discarded – undo
668 668
 	 */
669 669
 	private static function get_name_text_fields( $form_id ) {
670 670
 		$name_text_fields_is_initialized = is_array( self::$name_text_fields );
671
-		if ( $name_text_fields_is_initialized && isset( self::$name_text_fields[ $form_id ] ) ) {
672
-			return self::$name_text_fields[ $form_id ];
671
+		if ( $name_text_fields_is_initialized && isset( self::$name_text_fields[$form_id] ) ) {
672
+			return self::$name_text_fields[$form_id];
673 673
 		}
674 674
 		if ( ! $name_text_fields_is_initialized ) {
675 675
 			self::$name_text_fields = array();
676 676
 		}
677
-		self::$name_text_fields[ $form_id ] = FrmDb::get_results(
677
+		self::$name_text_fields[$form_id] = FrmDb::get_results(
678 678
 			'frm_fields',
679 679
 			array(
680 680
 				'form_id' => $form_id,
@@ -685,7 +685,7 @@  discard block
 block discarded – undo
685 685
 			array( 'order_by' => 'field_order ASC' )
686 686
 		);
687 687
 
688
-		return self::$name_text_fields[ $form_id ];
688
+		return self::$name_text_fields[$form_id];
689 689
 	}
690 690
 
691 691
 	private static function add_server_values_to_akismet( &$datas ) {
@@ -694,7 +694,7 @@  discard block
 block discarded – undo
694 694
 
695 695
 			// Send any potentially useful $_SERVER vars, but avoid sending junk we don't need.
696 696
 			if ( $include_value ) {
697
-				$datas[ $key ] = $value;
697
+				$datas[$key] = $value;
698 698
 			}
699 699
 			unset( $key, $value );
700 700
 		}
@@ -711,10 +711,10 @@  discard block
 block discarded – undo
711 711
 	private static function add_comment_content_to_akismet( &$datas, $values ) {
712 712
 		if ( isset( $datas['frm_duplicated'] ) ) {
713 713
 			foreach ( $datas['frm_duplicated'] as $index ) {
714
-				if ( isset( $values['item_meta'][ $index ] ) ) {
715
-					unset( $values['item_meta'][ $index ] );
714
+				if ( isset( $values['item_meta'][$index] ) ) {
715
+					unset( $values['item_meta'][$index] );
716 716
 				} else {
717
-					unset( $values[ $index ] );
717
+					unset( $values[$index] );
718 718
 				}
719 719
 			}
720 720
 			unset( $datas['frm_duplicated'] );
@@ -733,14 +733,14 @@  discard block
 block discarded – undo
733 733
 	private static function skip_adding_values_to_akismet( &$values ) {
734 734
 		$skipped_fields = self::get_akismet_skipped_field_ids( $values );
735 735
 		foreach ( $skipped_fields as $skipped_field ) {
736
-			if ( ! isset( $values['item_meta'][ $skipped_field->id ] ) ) {
736
+			if ( ! isset( $values['item_meta'][$skipped_field->id] ) ) {
737 737
 				continue;
738 738
 			}
739 739
 
740 740
 			if ( self::should_really_skip_field( $skipped_field, $values ) ) {
741
-				unset( $values['item_meta'][ $skipped_field->id ] );
742
-				if ( isset( $values['item_meta']['other'][ $skipped_field->id ] ) ) {
743
-					unset( $values['item_meta']['other'][ $skipped_field->id ] );
741
+				unset( $values['item_meta'][$skipped_field->id] );
742
+				if ( isset( $values['item_meta']['other'][$skipped_field->id] ) ) {
743
+					unset( $values['item_meta']['other'][$skipped_field->id] );
744 744
 				}
745 745
 			}
746 746
 		}
@@ -776,14 +776,14 @@  discard block
 block discarded – undo
776 776
 		}
777 777
 
778 778
 		// If a choice field has Other option, but Other is not selected.
779
-		if ( empty( $values['item_meta']['other'][ $field_data->id ] ) ) {
779
+		if ( empty( $values['item_meta']['other'][$field_data->id] ) ) {
780 780
 			return true;
781 781
 		}
782 782
 
783 783
 		// Check if submitted value is same as one of field option.
784 784
 		foreach ( $field_data->options as $option ) {
785 785
 			$option_value = ! is_array( $option ) ? $option : ( isset( $option['value'] ) ? $option['value'] : '' );
786
-			if ( $values['item_meta']['other'][ $field_data->id ] === $option_value ) {
786
+			if ( $values['item_meta']['other'][$field_data->id] === $option_value ) {
787 787
 				return true;
788 788
 			}
789 789
 		}
@@ -854,7 +854,7 @@  discard block
 block discarded – undo
854 854
 
855 855
 			// Convert name array to string.
856 856
 			if ( isset( $value['first'] ) && isset( $value['last'] ) ) {
857
-				$values['item_meta'][ $field_id ] = trim( implode( ' ', $value ) );
857
+				$values['item_meta'][$field_id] = trim( implode( ' ', $value ) );
858 858
 				$values['name_field_ids'][]       = $field_id;
859 859
 				continue;
860 860
 			}
@@ -875,8 +875,8 @@  discard block
 block discarded – undo
875 875
 						continue;
876 876
 					}
877 877
 
878
-					if ( ! isset( $values['item_meta'][ $subsubindex ] ) ) {
879
-						$values['item_meta'][ $subsubindex ] = array();
878
+					if ( ! isset( $values['item_meta'][$subsubindex] ) ) {
879
+						$values['item_meta'][$subsubindex] = array();
880 880
 					}
881 881
 
882 882
 					// Convert name array to string.
@@ -886,11 +886,11 @@  discard block
 block discarded – undo
886 886
 						$values['name_field_ids'][] = $subsubindex;
887 887
 					}
888 888
 
889
-					$values['item_meta'][ $subsubindex ][] = $subsubvalue;
889
+					$values['item_meta'][$subsubindex][] = $subsubvalue;
890 890
 				}
891 891
 			}//end foreach
892 892
 
893
-			unset( $values['item_meta'][ $field_id ] );
893
+			unset( $values['item_meta'][$field_id] );
894 894
 		}//end foreach
895 895
 
896 896
 		return $form_ids;
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
@@ -236,8 +236,8 @@  discard block
 block discarded – undo
236 236
 		}
237 237
 
238 238
 		foreach ( $settings as $setting => $default ) {
239
-			if ( isset( $params[ 'frm_' . $setting ] ) ) {
240
-				$this->{$setting} = $params[ 'frm_' . $setting ];
239
+			if ( isset( $params['frm_' . $setting] ) ) {
240
+				$this->{$setting} = $params['frm_' . $setting];
241 241
 			} elseif ( ! isset( $this->{$setting} ) ) {
242 242
 				$this->{$setting} = $default;
243 243
 			}
@@ -428,7 +428,7 @@  discard block
 block discarded – undo
428 428
 			'wp_spam_check',
429 429
 		);
430 430
 		foreach ( $checkboxes as $set ) {
431
-			$this->$set = isset( $params[ 'frm_' . $set ] ) ? absint( $params[ 'frm_' . $set ] ) : 0;
431
+			$this->$set = isset( $params['frm_' . $set] ) ? absint( $params['frm_' . $set] ) : 0;
432 432
 		}
433 433
 	}
434 434
 
@@ -441,7 +441,7 @@  discard block
 block discarded – undo
441 441
 		$frm_roles = FrmAppHelper::frm_capabilities();
442 442
 		$roles     = get_editable_roles();
443 443
 		foreach ( $frm_roles as $frm_role => $frm_role_description ) {
444
-			$this->$frm_role = (array) ( isset( $params[ $frm_role ] ) ? $params[ $frm_role ] : 'administrator' );
444
+			$this->$frm_role = (array) ( isset( $params[$frm_role] ) ? $params[$frm_role] : 'administrator' );
445 445
 
446 446
 			// Make sure administrators always have permissions
447 447
 			if ( ! in_array( 'administrator', $this->$frm_role, true ) ) {
Please login to merge, or discard this patch.