Completed
Push — master ( ce427e...4339a7 )
by Jamie
06:16
created
classes/models/FrmEntryValidate.php 1 patch
Spacing   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -7,20 +7,20 @@  discard block
 block discarded – undo
7 7
         FrmEntry::sanitize_entry_post( $values );
8 8
         $errors = array();
9 9
 
10
-        if ( ! isset($values['form_id']) || ! isset($values['item_meta']) ) {
10
+        if ( ! isset( $values['form_id'] ) || ! isset( $values['item_meta'] ) ) {
11 11
             $errors['form'] = __( 'There was a problem with your submission. Please try again.', 'formidable' );
12 12
             return $errors;
13 13
         }
14 14
 
15
-		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' ) ) ) {
15
+		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' ) ) ) {
16 16
             $errors['form'] = __( 'You do not have permission to do that', 'formidable' );
17 17
         }
18 18
 
19
-        if ( ! isset($values['item_key']) || $values['item_key'] == '' ) {
19
+        if ( ! isset( $values['item_key'] ) || $values['item_key'] == '' ) {
20 20
 			$_POST['item_key'] = $values['item_key'] = FrmAppHelper::get_unique_key( '', $wpdb->prefix . 'frm_items', 'item_key' );
21 21
         }
22 22
 
23
-        $where = apply_filters('frm_posted_field_ids', array( 'fi.form_id' => $values['form_id'] ) );
23
+        $where = apply_filters( 'frm_posted_field_ids', array( 'fi.form_id' => $values['form_id'] ) );
24 24
 		// Don't get subfields
25 25
 		$where['fr.parent_form_id'] = array( null, 0 );
26 26
 		// Don't get excluded fields (like file upload fields in the ajax validation)
@@ -28,20 +28,20 @@  discard block
 block discarded – undo
28 28
 			$where['fi.type not'] = $exclude;
29 29
 		}
30 30
 
31
-        $posted_fields = FrmField::getAll($where, 'field_order');
31
+        $posted_fields = FrmField::getAll( $where, 'field_order' );
32 32
 
33 33
         // Pass exclude value to validate_field function so it can be used for repeating sections
34 34
         $args = array( 'exclude' => $exclude );
35 35
 
36 36
         foreach ( $posted_fields as $posted_field ) {
37
-            self::validate_field($posted_field, $errors, $values, $args);
38
-            unset($posted_field);
37
+            self::validate_field( $posted_field, $errors, $values, $args );
38
+            unset( $posted_field );
39 39
         }
40 40
 
41 41
         // check for spam
42 42
         self::spam_check( $exclude, $values, $errors );
43 43
 
44
-        $errors = apply_filters( 'frm_validate_entry', $errors, $values, compact('exclude') );
44
+        $errors = apply_filters( 'frm_validate_entry', $errors, $values, compact( 'exclude' ) );
45 45
 
46 46
         return $errors;
47 47
     }
@@ -55,8 +55,8 @@  discard block
 block discarded – undo
55 55
         );
56 56
         $args = wp_parse_args( $args, $defaults );
57 57
 
58
-        if ( empty($args['parent_field_id']) ) {
59
-			$value = isset( $values['item_meta'][ $args['id'] ] ) ? $values['item_meta'][ $args['id'] ] : '';
58
+        if ( empty( $args['parent_field_id'] ) ) {
59
+			$value = isset( $values['item_meta'][$args['id']] ) ? $values['item_meta'][$args['id']] : '';
60 60
         } else {
61 61
             // value is from a nested form
62 62
             $value = $values;
@@ -68,12 +68,12 @@  discard block
 block discarded – undo
68 68
 		self::maybe_clear_value_for_default_blank_setting( $posted_field, $value );
69 69
 
70 70
 		// Reset arrays with only one value if it's not a field where array keys need to be preserved
71
-		if ( is_array($value) && count( $value ) == 1 && isset( $value[0] ) ) {
72
-			$value = reset($value);
71
+		if ( is_array( $value ) && count( $value ) == 1 && isset( $value[0] ) ) {
72
+			$value = reset( $value );
73 73
 		}
74 74
 
75 75
         if ( $posted_field->required == '1' && ! is_array( $value ) && trim( $value ) == '' ) {
76
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $posted_field, 'blank' );
76
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $posted_field, 'blank' );
77 77
         } else if ( $posted_field->type == 'text' && ! isset( $_POST['item_name'] ) ) {
78 78
             $_POST['item_name'] = $value;
79 79
         }
@@ -85,9 +85,9 @@  discard block
 block discarded – undo
85 85
 			self::validate_phone_field( $errors, $posted_field, $value, $args );
86 86
 		}
87 87
 
88
-        FrmEntriesHelper::set_posted_value($posted_field, $value, $args);
88
+        FrmEntriesHelper::set_posted_value( $posted_field, $value, $args );
89 89
 
90
-        self::validate_recaptcha($errors, $posted_field, $args);
90
+        self::validate_recaptcha( $errors, $posted_field, $args );
91 91
 
92 92
 		$errors = apply_filters( 'frm_validate_' . $posted_field->type . '_field_entry', $errors, $posted_field, $value, $args );
93 93
 		$errors = apply_filters( 'frm_validate_field_entry', $errors, $posted_field, $value, $args );
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
             return;
105 105
         }
106 106
 
107
-        if ( trim($value) == 'http://' ) {
107
+        if ( trim( $value ) == 'http://' ) {
108 108
             $value = '';
109 109
         } else {
110 110
             $value = esc_url_raw( $value );
@@ -112,8 +112,8 @@  discard block
 block discarded – undo
112 112
         }
113 113
 
114 114
         //validate the url format
115
-        if ( ! preg_match('/^http(s)?:\/\/([\da-z\.-]+)\.([\da-z\.-]+)/i', $value) ) {
116
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
115
+        if ( ! preg_match( '/^http(s)?:\/\/([\da-z\.-]+)\.([\da-z\.-]+)/i', $value ) ) {
116
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
117 117
         }
118 118
     }
119 119
 
@@ -123,8 +123,8 @@  discard block
 block discarded – undo
123 123
         }
124 124
 
125 125
         //validate the email format
126
-        if ( ! is_email($value) ) {
127
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
126
+        if ( ! is_email( $value ) ) {
127
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
128 128
         }
129 129
     }
130 130
 
@@ -134,8 +134,8 @@  discard block
 block discarded – undo
134 134
 			return;
135 135
 		}
136 136
 
137
-		if ( ! is_numeric( $value) ) {
138
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
137
+		if ( ! is_numeric( $value ) ) {
138
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
139 139
 		}
140 140
 
141 141
 		// validate number settings
@@ -145,9 +145,9 @@  discard block
 block discarded – undo
145 145
 			if ( $frm_settings->use_html && isset( $field->field_options['minnum'] ) && isset( $field->field_options['maxnum'] ) ) {
146 146
 				//minnum maxnum
147 147
 				if ( (float) $value < $field->field_options['minnum'] ) {
148
-					$errors[ 'field' . $args['id'] ] = __( 'Please select a higher number', 'formidable' );
148
+					$errors['field' . $args['id']] = __( 'Please select a higher number', 'formidable' );
149 149
 				} else if ( (float) $value > $field->field_options['maxnum'] ) {
150
-					$errors[ 'field' . $args['id'] ] = __( 'Please select a lower number', 'formidable' );
150
+					$errors['field' . $args['id']] = __( 'Please select a lower number', 'formidable' );
151 151
 				}
152 152
 			}
153 153
 		}
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
 			$pattern = self::phone_format( $field );
160 160
 
161 161
 			if ( ! preg_match( $pattern, $value ) ) {
162
-				$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
162
+				$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
163 163
 			}
164 164
 		}
165 165
 	}
@@ -230,11 +230,11 @@  discard block
 block discarded – undo
230 230
 			return;
231 231
 		}
232 232
 
233
-        if ( ! isset($_POST['g-recaptcha-response']) ) {
233
+        if ( ! isset( $_POST['g-recaptcha-response'] ) ) {
234 234
             // If captcha is missing, check if it was already verified
235 235
 			if ( ! isset( $_POST['recaptcha_checked'] ) || ! wp_verify_nonce( $_POST['recaptcha_checked'], 'frm_ajax' ) ) {
236 236
                 // There was no captcha submitted
237
-				$errors[ 'field' . $args['id'] ] = __( 'The captcha is missing from this form', 'formidable' );
237
+				$errors['field' . $args['id']] = __( 'The captcha is missing from this form', 'formidable' );
238 238
             }
239 239
             return;
240 240
         }
@@ -247,15 +247,15 @@  discard block
 block discarded – undo
247 247
 			),
248 248
 		);
249 249
         $resp = wp_remote_post( 'https://www.google.com/recaptcha/api/siteverify', $arg_array );
250
-        $response = json_decode(wp_remote_retrieve_body( $resp ), true);
250
+        $response = json_decode( wp_remote_retrieve_body( $resp ), true );
251 251
 
252 252
         if ( isset( $response['success'] ) && ! $response['success'] ) {
253 253
             // What happens when the CAPTCHA was entered incorrectly
254
-			$errors[ 'field' . $args['id'] ] = ( ! isset( $field->field_options['invalid'] ) || $field->field_options['invalid'] == '' ) ? $frm_settings->re_msg : $field->field_options['invalid'];
254
+			$errors['field' . $args['id']] = ( ! isset( $field->field_options['invalid'] ) || $field->field_options['invalid'] == '' ) ? $frm_settings->re_msg : $field->field_options['invalid'];
255 255
         } else if ( is_wp_error( $resp ) ) {
256 256
 			$error_string = $resp->get_error_message();
257
-			$errors[ 'field' . $args['id'] ] = __( 'There was a problem verifying your recaptcha', 'formidable' );
258
-			$errors[ 'field' . $args['id'] ] .= ' ' . $error_string;
257
+			$errors['field' . $args['id']] = __( 'There was a problem verifying your recaptcha', 'formidable' );
258
+			$errors['field' . $args['id']] .= ' ' . $error_string;
259 259
         }
260 260
     }
261 261
 
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
 
285 285
 	private static function is_akismet_spam( $values ) {
286 286
 		global $wpcom_api_key;
287
-		return ( is_callable('Akismet::http_post') && ( get_option('wordpress_api_key') || $wpcom_api_key ) && self::akismet( $values ) );
287
+		return ( is_callable( 'Akismet::http_post' ) && ( get_option( 'wordpress_api_key' ) || $wpcom_api_key ) && self::akismet( $values ) );
288 288
 	}
289 289
 
290 290
 	private static function is_akismet_enabled_for_user( $form_id ) {
@@ -293,7 +293,7 @@  discard block
 block discarded – undo
293 293
 	}
294 294
 
295 295
     public static function blacklist_check( $values ) {
296
-        if ( ! apply_filters('frm_check_blacklist', true, $values) ) {
296
+        if ( ! apply_filters( 'frm_check_blacklist', true, $values ) ) {
297 297
             return false;
298 298
         }
299 299
 
@@ -303,9 +303,9 @@  discard block
 block discarded – undo
303 303
     		return false;
304 304
     	}
305 305
 
306
-    	$content = FrmEntriesHelper::entry_array_to_string($values);
306
+    	$content = FrmEntriesHelper::entry_array_to_string( $values );
307 307
 
308
-		if ( empty($content) ) {
308
+		if ( empty( $content ) ) {
309 309
 		    return false;
310 310
 		}
311 311
 
@@ -314,11 +314,11 @@  discard block
 block discarded – undo
314 314
     	foreach ( (array) $words as $word ) {
315 315
     		$word = trim( $word );
316 316
 
317
-    		if ( empty($word) ) {
317
+    		if ( empty( $word ) ) {
318 318
     			continue;
319 319
     		}
320 320
 
321
-    		if ( preg_match('#' . preg_quote( $word, '#' ) . '#', $content) ) {
321
+    		if ( preg_match( '#' . preg_quote( $word, '#' ) . '#', $content ) ) {
322 322
     			return true;
323 323
     		}
324 324
     	}
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
347 347
 			unset( $key, $data );
348 348
 		}
349 349
 
350
-        $response = Akismet::http_post($query_string, 'comment-check');
350
+        $response = Akismet::http_post( $query_string, 'comment-check' );
351 351
 
352 352
 		return ( is_array( $response ) && $response[1] == 'true' );
353 353
     }
@@ -370,12 +370,12 @@  discard block
 block discarded – undo
370 370
 
371 371
         foreach ( $_SERVER as $key => $value ) {
372 372
 			if ( ! in_array( $key, array( 'HTTP_COOKIE', 'HTTP_COOKIE2', 'PHP_AUTH_PW' ) ) && is_string( $value ) ) {
373
-				$datas[ $key ] = wp_strip_all_tags( $value );
373
+				$datas[$key] = wp_strip_all_tags( $value );
374 374
             } else {
375
-				$datas[ $key ] = '';
375
+				$datas[$key] = '';
376 376
             }
377 377
 
378
-            unset($key, $value);
378
+            unset( $key, $value );
379 379
         }
380 380
     }
381 381
 }
Please login to merge, or discard this patch.