| @@ -3,22 +3,8 @@ | ||
| 3 | 3 | die( 'You are not allowed to call this page directly.' ); |
| 4 | 4 | } |
| 5 | 5 | |
| 6 | 6 | class FrmEntryValidate { |
| 7 | - | |
| 8 | - /** | |
| 9 | - * @since 6.17 | |
| 10 | - * | |
| 11 | - * @var array|null | |
| 12 | - */ | |
| 13 | - private static $name_text_fields; | |
| 14 | - | |
| 15 | - /** | |
| 16 | - * @param array $values | |
| 17 | - * @param bool|string[] $exclude | |
| 18 | - * | |
| 19 | - * @return array | |
| 20 | - */ | |
| 21 | 7 | public static function validate( $values, $exclude = false ) { |
| 22 | 8 | FrmEntry::sanitize_entry_post( $values ); |
| 23 | 9 | $errors = array(); |
| 24 | 10 | |
| @@ -28,13 +14,11 @@ | ||
| 28 | 14 | return $errors; |
| 29 | 15 | } |
| 30 | 16 | |
| 31 | 17 | 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' ) ) ) { |
| 32 | - $frm_settings = FrmAppHelper::get_settings(); | |
| 33 | - $errors['form'] = $frm_settings->admin_permission; | |
| 18 | + $errors['form'] = __( 'You do not have permission to do that', 'formidable' ); | |
| 34 | 19 | } |
| 35 | 20 | |
| 36 | - self::maybe_fix_item_meta(); | |
| 37 | 21 | self::set_item_key( $values ); |
| 38 | 22 | |
| 39 | 23 | $posted_fields = self::get_fields_to_validate( $values, $exclude ); |
| 40 | 24 | |
| @@ -58,39 +42,13 @@ | ||
| 58 | 42 | * @param array $errors Errors data. |
| 59 | 43 | * @param array $values Value data of the form. |
| 60 | 44 | * @param array $args Custom arguments. Contains `exclude` and `posted_fields`. |
| 61 | 45 | */ |
| 62 | - $filtered_errors = apply_filters( 'frm_validate_entry', $errors, $values, compact( 'exclude', 'posted_fields' ) ); | |
| 46 | + $errors = apply_filters( 'frm_validate_entry', $errors, $values, compact( 'exclude', 'posted_fields' ) ); | |
| 63 | 47 | |
| 64 | - if ( is_array( $filtered_errors ) ) { | |
| 65 | - $errors = $filtered_errors; | |
| 66 | - } else { | |
| 67 | - _doing_it_wrong( __METHOD__, 'Only arrays should be returned when using the frm_validate_entry filter.', '6.3' ); | |
| 68 | - } | |
| 69 | - | |
| 70 | 48 | return $errors; |
| 71 | 49 | } |
| 72 | 50 | |
| 73 | - /** | |
| 74 | - * In case $_POST['item_meta'] is not an array, change it to an empty array. | |
| 75 | - * This helps to avoid some warnings and errors when $_POST['item_meta'] is updated. | |
| 76 | - * | |
| 77 | - * @since 6.6 | |
| 78 | - * | |
| 79 | - * @return void | |
| 80 | - */ | |
| 81 | - private static function maybe_fix_item_meta() { | |
| 82 | - // phpcs:ignore WordPress.Security.NonceVerification.Missing, WordPress.Security.ValidatedSanitizedInput.InputNotValidated | |
| 83 | - if ( ! isset( $_POST['item_meta'] ) || ! is_array( $_POST['item_meta'] ) ) { | |
| 84 | - $_POST['item_meta'] = array(); | |
| 85 | - } | |
| 86 | - } | |
| 87 | - | |
| 88 | - /** | |
| 89 | - * @param array $values | |
| 90 | - * | |
| 91 | - * @return void | |
| 92 | - */ | |
| 93 | 51 | private static function set_item_key( &$values ) { |
| 94 | 52 | if ( ! isset( $values['item_key'] ) || $values['item_key'] == '' ) { |
| 95 | 53 | global $wpdb; |
| 96 | 54 | $values['item_key'] = FrmAppHelper::get_unique_key( '', $wpdb->prefix . 'frm_items', 'item_key' ); |
| @@ -97,14 +55,8 @@ | ||
| 97 | 55 | $_POST['item_key'] = $values['item_key']; |
| 98 | 56 | } |
| 99 | 57 | } |
| 100 | 58 | |
| 101 | - /** | |
| 102 | - * @param array $values | |
| 103 | - * @param array|string $exclude | |
| 104 | - * | |
| 105 | - * @return array | |
| 106 | - */ | |
| 107 | 59 | private static function get_fields_to_validate( $values, $exclude ) { |
| 108 | 60 | $where = apply_filters( 'frm_posted_field_ids', array( 'fi.form_id' => $values['form_id'] ) ); |
| 109 | 61 | |
| 110 | 62 | // Don't get subfields |
| @@ -127,31 +79,19 @@ | ||
| 127 | 79 | */ |
| 128 | 80 | return apply_filters( 'frm_fields_to_validate', $fields, compact( 'values', 'exclude', 'where' ) ); |
| 129 | 81 | } |
| 130 | 82 | |
| 131 | - /** | |
| 132 | - * @param object $posted_field | |
| 133 | - * @param array $errors | |
| 134 | - * @param array $values | |
| 135 | - * @param array $args | |
| 136 | - * | |
| 137 | - * @return void | |
| 138 | - */ | |
| 139 | 83 | public static function validate_field( $posted_field, &$errors, $values, $args = array() ) { |
| 140 | 84 | $defaults = array( |
| 141 | 85 | 'id' => $posted_field->id, |
| 142 | - // The id of the repeat or embed form. | |
| 143 | - 'parent_field_id' => '', | |
| 144 | - // The pointer in the posted array. | |
| 145 | - 'key_pointer' => '', | |
| 146 | - // Exclude these field types from validation. | |
| 147 | - 'exclude' => array(), | |
| 148 | - | |
| 86 | + 'parent_field_id' => '', // the id of the repeat or embed form | |
| 87 | + 'key_pointer' => '', // the pointer in the posted array | |
| 88 | + 'exclude' => array(), // exclude these field types from validation | |
| 149 | 89 | ); |
| 150 | - $args = wp_parse_args( $args, $defaults ); | |
| 90 | + $args = wp_parse_args( $args, $defaults ); | |
| 151 | 91 | |
| 152 | 92 | if ( empty( $args['parent_field_id'] ) ) { |
| 153 | - $value = $values['item_meta'][ $args['id'] ] ?? ''; | |
| 93 | + $value = isset( $values['item_meta'][ $args['id'] ] ) ? $values['item_meta'][ $args['id'] ] : ''; | |
| 154 | 94 | } else { |
| 155 | 95 | // value is from a nested form |
| 156 | 96 | $value = $values; |
| 157 | 97 | } |
| @@ -161,9 +101,8 @@ | ||
| 161 | 101 | |
| 162 | 102 | self::maybe_clear_value_for_default_blank_setting( $posted_field, $value ); |
| 163 | 103 | |
| 164 | 104 | $should_trim = is_array( $value ) && count( $value ) == 1 && isset( $value[0] ) && $posted_field->type !== 'checkbox'; |
| 165 | - | |
| 166 | 105 | if ( $should_trim ) { |
| 167 | 106 | $value = reset( $value ); |
| 168 | 107 | } |
| 169 | 108 | |
| @@ -172,15 +111,14 @@ | ||
| 172 | 111 | } |
| 173 | 112 | |
| 174 | 113 | if ( $posted_field->required == '1' && FrmAppHelper::is_empty_value( $value ) ) { |
| 175 | 114 | $errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $posted_field, 'blank' ); |
| 176 | - } elseif ( ! isset( $_POST['item_name'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing | |
| 177 | - self::maybe_add_item_name( $value, $posted_field ); | |
| 115 | + } elseif ( $posted_field->type === 'text' && ! isset( $_POST['item_name'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing | |
| 116 | + $_POST['item_name'] = $value; | |
| 178 | 117 | } |
| 179 | 118 | |
| 180 | 119 | FrmEntriesHelper::set_posted_value( $posted_field, $value, $args ); |
| 181 | 120 | |
| 182 | - self::validate_options( $errors, $posted_field, $value, $args ); | |
| 183 | 121 | self::validate_field_types( $errors, $posted_field, $value, $args ); |
| 184 | 122 | |
| 185 | 123 | // Field might want to modify value before other parts of the system |
| 186 | 124 | // e.g. trim off excess values like in the case of fields with limit. |
| @@ -191,232 +129,18 @@ | ||
| 191 | 129 | } |
| 192 | 130 | |
| 193 | 131 | $errors = apply_filters( 'frm_validate_' . $posted_field->type . '_field_entry', $errors, $posted_field, $value, $args ); |
| 194 | 132 | $errors = apply_filters( 'frm_validate_field_entry', $errors, $posted_field, $value, $args ); |
| 195 | - | |
| 196 | - if ( ! FrmAppHelper::pro_is_installed() && empty( $args['other'] ) ) { | |
| 197 | - FrmEntriesHelper::get_posted_value( $posted_field, $value, $args ); | |
| 198 | - } | |
| 199 | 133 | } |
| 200 | 134 | |
| 201 | 135 | /** |
| 202 | - * @since 6.21 | |
| 203 | - * | |
| 204 | - * @param array $errors | |
| 205 | - * @param object $posted_field | |
| 206 | - * @param array|string $value | |
| 207 | - * @param array $args | |
| 208 | - * | |
| 209 | - * @return void | |
| 210 | - */ | |
| 211 | - private static function validate_options( &$errors, $posted_field, $value, $args ) { | |
| 212 | - if ( empty( $posted_field->options ) ) { | |
| 213 | - return; | |
| 214 | - } | |
| 215 | - | |
| 216 | - $option_is_valid = self::option_is_valid( $posted_field, $value, $posted_field->options ); | |
| 217 | - | |
| 218 | - /** | |
| 219 | - * @since 6.21 | |
| 220 | - * | |
| 221 | - * @param bool $option_is_valid | |
| 222 | - * @param array|string $value | |
| 223 | - * @param object $field | |
| 224 | - */ | |
| 225 | - $option_is_valid = (bool) apply_filters( 'frm_option_is_valid', $option_is_valid, $value, $posted_field ); | |
| 226 | - | |
| 227 | - if ( ! $option_is_valid ) { | |
| 228 | - $errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $posted_field, 'invalid' ); | |
| 229 | - } | |
| 230 | - } | |
| 231 | - | |
| 232 | - /** | |
| 233 | - * Validate that value matches one of the options for the field. | |
| 234 | - * | |
| 235 | - * @since 6.21 | |
| 236 | - * | |
| 237 | - * @param stdClass $field | |
| 238 | - * @param array|string $value | |
| 239 | - * @param array $options | |
| 240 | - * | |
| 241 | - * @return bool | |
| 242 | - */ | |
| 243 | - private static function option_is_valid( $field, $value, $options ) { | |
| 244 | - if ( '' === $value ) { | |
| 245 | - return true; | |
| 246 | - } | |
| 247 | - | |
| 248 | - $field_object = FrmFieldFactory::get_field_type( $field->type, $field ); | |
| 249 | - | |
| 250 | - if ( ! $field_object->field_type_has_options_settings() ) { | |
| 251 | - return true; | |
| 252 | - } | |
| 253 | - | |
| 254 | - if ( in_array( $field->type, array( 'likert', 'ranking' ), true ) ) { | |
| 255 | - // Ignore these field types automatically. | |
| 256 | - return true; | |
| 257 | - } | |
| 258 | - | |
| 259 | - if ( 'product' === $field->type && 'user_def' === FrmField::get_option( $field, 'data_type' ) ) { | |
| 260 | - return true; | |
| 261 | - } | |
| 262 | - | |
| 263 | - if ( ! empty( $field->field_options['post_field'] ) ) { | |
| 264 | - return true; | |
| 265 | - } | |
| 266 | - | |
| 267 | - $value = (array) $value; | |
| 268 | - | |
| 269 | - foreach ( $value as $current_value ) { | |
| 270 | - $match = false; | |
| 271 | - | |
| 272 | - foreach ( $options as $key => $option ) { | |
| 273 | - if ( strpos( $key, 'other_' ) === 0 ) { | |
| 274 | - // Always return true if an other option is found. | |
| 275 | - return true; | |
| 276 | - } | |
| 277 | - | |
| 278 | - if ( is_array( $option ) ) { | |
| 279 | - $separate_value = FrmField::get_option( $field, 'separate_value' ); | |
| 280 | - $option_value = $separate_value ? $option['value'] : $option['label']; | |
| 281 | - } else { | |
| 282 | - $option_value = $option; | |
| 283 | - } | |
| 284 | - | |
| 285 | - $match = trim( $current_value ) === trim( $option_value ); | |
| 286 | - | |
| 287 | - if ( $match ) { | |
| 288 | - break; | |
| 289 | - } | |
| 290 | - | |
| 291 | - $match = trim( $current_value ) === trim( do_shortcode( $option_value ) ); | |
| 292 | - | |
| 293 | - if ( $match ) { | |
| 294 | - break; | |
| 295 | - } | |
| 296 | - | |
| 297 | - $match = self::is_filtered_match( $current_value, $option_value ); | |
| 298 | - | |
| 299 | - if ( $match ) { | |
| 300 | - break; | |
| 301 | - } | |
| 302 | - | |
| 303 | - if ( is_numeric( $current_value ) ) { | |
| 304 | - $match = (int) $current_value === (int) $option_value; | |
| 305 | - | |
| 306 | - if ( $match ) { | |
| 307 | - break; | |
| 308 | - } | |
| 309 | - } | |
| 310 | - }//end foreach | |
| 311 | - | |
| 312 | - if ( ! $match ) { | |
| 313 | - return self::options_are_dynamic_based_on_hook( $field, $value ); | |
| 314 | - } | |
| 315 | - }//end foreach | |
| 316 | - | |
| 317 | - return true; | |
| 318 | - } | |
| 319 | - | |
| 320 | - /** | |
| 321 | - * Make an extra check after passing $option_value through the_content filter. | |
| 322 | - * This is to help catch cases where the option's formatting has been modified using | |
| 323 | - * the_content filter. | |
| 324 | - * | |
| 325 | - * @since 6.22 | |
| 326 | - * | |
| 327 | - * @param string $value | |
| 328 | - * @param string $option_value | |
| 329 | - * | |
| 330 | - * @return bool | |
| 331 | - */ | |
| 332 | - private static function is_filtered_match( $value, $option_value ) { | |
| 333 | - // First remove the wpautop filter so it doesn't add extra tags to $option_value. | |
| 334 | - $filter_priority = has_filter( 'the_content', 'wpautop' ); | |
| 335 | - | |
| 336 | - if ( is_numeric( $filter_priority ) ) { | |
| 337 | - remove_filter( 'the_content', 'wpautop', $filter_priority ); | |
| 338 | - } | |
| 339 | - | |
| 340 | - $filtered_option = apply_filters( 'the_content', $option_value ); | |
| 341 | - | |
| 342 | - if ( is_numeric( $filter_priority ) ) { | |
| 343 | - add_filter( 'the_content', 'wpautop', $filter_priority ); | |
| 344 | - } | |
| 345 | - return trim( $value ) === trim( $filtered_option ); | |
| 346 | - } | |
| 347 | - | |
| 348 | - /** | |
| 349 | - * Do not validate options if they have been modified with a hook. | |
| 350 | - * This is to help avoid issues where the options could be based on a URL param for example. | |
| 351 | - * | |
| 352 | - * @since 6.21 | |
| 353 | - * | |
| 354 | - * @param object $field_object The field object. | |
| 355 | - * @param array|string $value The value to validate. | |
| 356 | - * | |
| 357 | - * @return bool | |
| 358 | - */ | |
| 359 | - private static function options_are_dynamic_based_on_hook( $field_object, $value ) { | |
| 360 | - $values = (array) $field_object; | |
| 361 | - $values['value'] = $value; | |
| 362 | - FrmFieldsHelper::prepare_new_front_field( $values, $field_object ); | |
| 363 | - | |
| 364 | - $separate_value = FrmField::get_option( $field_object, 'separate_value' ); | |
| 365 | - $map_callback = function ( $option ) use ( $separate_value ) { | |
| 366 | - if ( is_array( $option ) ) { | |
| 367 | - $option_value = $separate_value ? $option['value'] : $option['label']; | |
| 368 | - } else { | |
| 369 | - $option_value = $option; | |
| 370 | - } | |
| 371 | - | |
| 372 | - $option_value = do_shortcode( $option_value ); | |
| 373 | - return $option_value; | |
| 374 | - }; | |
| 375 | - | |
| 376 | - $values_options = array_map( $map_callback, $values['options'] ); | |
| 377 | - $field_object_options = array_map( $map_callback, $field_object->options ); | |
| 378 | - | |
| 379 | - return $values_options !== $field_object_options; | |
| 380 | - } | |
| 381 | - | |
| 382 | - /** | |
| 383 | - * Maybe add item_name to $_POST to save it in items table. | |
| 384 | - * | |
| 385 | - * @since 5.2.02 | |
| 386 | - * | |
| 387 | - * @param array|string $value Field value. | |
| 388 | - * @param object $field Field object. | |
| 389 | - * | |
| 390 | - * @return void | |
| 391 | - */ | |
| 392 | - private static function maybe_add_item_name( $value, $field ) { | |
| 393 | - $item_name = false; | |
| 394 | - | |
| 395 | - if ( 'name' === $field->type ) { | |
| 396 | - $field_obj = FrmFieldFactory::get_field_object( $field ); | |
| 397 | - $item_name = $field_obj->get_display_value( $value ); | |
| 398 | - } elseif ( 'text' === $field->type ) { | |
| 399 | - $item_name = $value; | |
| 400 | - } | |
| 401 | - | |
| 402 | - if ( false !== $item_name ) { | |
| 403 | - // Item name has a max length of 255 characters so truncate it so it doesn't fail to save in the database. | |
| 404 | - $_POST['item_name'] = substr( $item_name, 0, 255 ); | |
| 405 | - } | |
| 406 | - } | |
| 407 | - | |
| 408 | - /** | |
| 409 | 136 | * Set $value to an empty string if it matches its label |
| 410 | 137 | * |
| 411 | 138 | * @param object $field |
| 412 | 139 | * @param string $value |
| 413 | - * | |
| 414 | - * @return void | |
| 415 | 140 | */ |
| 416 | 141 | private static function maybe_clear_value_for_default_blank_setting( $field, &$value ) { |
| 417 | 142 | $position = FrmField::get_option( $field, 'label' ); |
| 418 | - | |
| 419 | 143 | if ( ! $position ) { |
| 420 | 144 | $position = FrmStylesController::get_style_val( 'position', $field->form_id ); |
| 421 | 145 | } |
| 422 | 146 | |
| @@ -424,16 +148,8 @@ | ||
| 424 | 148 | $value = ''; |
| 425 | 149 | } |
| 426 | 150 | } |
| 427 | 151 | |
| 428 | - /** | |
| 429 | - * @param array $errors | |
| 430 | - * @param object $posted_field | |
| 431 | - * @param mixed $value | |
| 432 | - * @param array $args | |
| 433 | - * | |
| 434 | - * @return void | |
| 435 | - */ | |
| 436 | 152 | public static function validate_field_types( &$errors, $posted_field, $value, $args ) { |
| 437 | 153 | $field_obj = FrmFieldFactory::get_field_object( $posted_field ); |
| 438 | 154 | $args['value'] = $value; |
| 439 | 155 | $args['errors'] = $errors; |
| @@ -438,26 +154,16 @@ | ||
| 438 | 154 | $args['value'] = $value; |
| 439 | 155 | $args['errors'] = $errors; |
| 440 | 156 | |
| 441 | 157 | $new_errors = $field_obj->validate( $args ); |
| 442 | - | |
| 443 | 158 | if ( ! empty( $new_errors ) ) { |
| 444 | 159 | $errors = array_merge( $errors, $new_errors ); |
| 445 | 160 | } |
| 446 | 161 | } |
| 447 | 162 | |
| 448 | - /** | |
| 449 | - * @param array $errors | |
| 450 | - * @param object $field | |
| 451 | - * @param string $value | |
| 452 | - * @param array $args | |
| 453 | - * | |
| 454 | - * @return void | |
| 455 | - */ | |
| 456 | 163 | public static function validate_phone_field( &$errors, $field, $value, $args ) { |
| 457 | - $format_value = FrmField::get_option( $field, 'format' ); | |
| 164 | + if ( $field->type == 'phone' || ( $field->type == 'text' && FrmField::is_option_true_in_object( $field, 'format' ) ) ) { | |
| 458 | 165 | |
| 459 | - if ( $field->type === 'phone' || ( $field->type === 'text' && $format_value && ! FrmCurrencyHelper::is_currency_format( $format_value ) ) ) { | |
| 460 | 166 | $pattern = self::phone_format( $field ); |
| 461 | 167 | |
| 462 | 168 | if ( ! preg_match( $pattern, $value ) ) { |
| 463 | 169 | $errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $field, 'invalid' ); |
| @@ -464,13 +170,8 @@ | ||
| 464 | 170 | } |
| 465 | 171 | } |
| 466 | 172 | } |
| 467 | 173 | |
| 468 | - /** | |
| 469 | - * @param object $field | |
| 470 | - * | |
| 471 | - * @return string | |
| 472 | - */ | |
| 473 | 174 | public static function phone_format( $field ) { |
| 474 | 175 | if ( FrmField::is_option_empty( $field, 'format' ) ) { |
| 475 | 176 | $pattern = self::default_phone_format(); |
| 476 | 177 | } else { |
| @@ -476,11 +177,8 @@ | ||
| 476 | 177 | } else { |
| 477 | 178 | $pattern = FrmField::get_option( $field, 'format' ); |
| 478 | 179 | } |
| 479 | 180 | |
| 480 | - // Ampersands are saved as &. | |
| 481 | - // Reverse it here so we are checking for the correct character. | |
| 482 | - $pattern = html_entity_decode( $pattern ); | |
| 483 | 181 | $pattern = apply_filters( 'frm_phone_pattern', $pattern, $field ); |
| 484 | 182 | |
| 485 | 183 | // Create a regexp if format is not already a regexp |
| 486 | 184 | if ( strpos( $pattern, '^' ) !== 0 ) { |
| @@ -493,10 +191,8 @@ | ||
| 493 | 191 | } |
| 494 | 192 | |
| 495 | 193 | /** |
| 496 | 194 | * @since 3.01 |
| 497 | - * | |
| 498 | - * @return string | |
| 499 | 195 | */ |
| 500 | 196 | private static function default_phone_format() { |
| 501 | 197 | return '^((\+\d{1,3}(-|.| )?\(?\d\)?(-| |.)?\d{1,5})|(\(?\d{2,6}\)?))(-|.| )?(\d{3,4})(-|.| )?(\d{4})(( x| ext)\d{1,5}){0,1}$'; |
| 502 | 198 | } |
| @@ -525,9 +221,8 @@ | ||
| 525 | 221 | |
| 526 | 222 | if ( strpos( $pattern, '\?' ) !== false ) { |
| 527 | 223 | $parts = explode( '\?', $pattern ); |
| 528 | 224 | $pattern = ''; |
| 529 | - | |
| 530 | 225 | foreach ( $parts as $part ) { |
| 531 | 226 | if ( empty( $pattern ) ) { |
| 532 | 227 | $pattern .= $part; |
| 533 | 228 | } else { |
| @@ -534,9 +229,8 @@ | ||
| 534 | 229 | $pattern .= '(' . $part . ')?'; |
| 535 | 230 | } |
| 536 | 231 | } |
| 537 | 232 | } |
| 538 | - | |
| 539 | 233 | $pattern = '^' . $pattern . '$'; |
| 540 | 234 | |
| 541 | 235 | return $pattern; |
| 542 | 236 | } |
| @@ -541,40 +235,27 @@ | ||
| 541 | 235 | return $pattern; |
| 542 | 236 | } |
| 543 | 237 | |
| 544 | 238 | /** |
| 545 | - * Check for spam. | |
| 239 | + * Check for spam | |
| 546 | 240 | * |
| 547 | - * @param bool $exclude | |
| 241 | + * @param boolean $exclude | |
| 548 | 242 | * @param array $values |
| 549 | - * @param array $errors By reference. | |
| 550 | - * | |
| 551 | - * @return void | |
| 243 | + * @param array $errors by reference | |
| 552 | 244 | */ |
| 553 | 245 | public static function spam_check( $exclude, $values, &$errors ) { |
| 554 | - if ( defined( 'WP_IMPORTING' ) && WP_IMPORTING ) { | |
| 555 | - // Do not check spam on importing. | |
| 556 | - return; | |
| 557 | - } | |
| 558 | - | |
| 559 | - if ( ! empty( $exclude ) || empty( $values['item_meta'] ) || ! empty( $errors ) ) { | |
| 246 | + if ( ! empty( $exclude ) || ! isset( $values['item_meta'] ) || empty( $values['item_meta'] ) || ! empty( $errors ) ) { | |
| 560 | 247 | // only check spam if there are no other errors |
| 561 | 248 | return; |
| 562 | 249 | } |
| 563 | 250 | |
| 564 | 251 | $antispam_check = self::is_antispam_check( $values['form_id'] ); |
| 565 | - $spam_msg = FrmAntiSpamController::get_default_spam_message(); | |
| 566 | - | |
| 567 | 252 | if ( is_string( $antispam_check ) ) { |
| 568 | 253 | $errors['spam'] = $antispam_check; |
| 569 | 254 | } elseif ( self::is_honeypot_spam( $values ) || self::is_spam_bot() ) { |
| 570 | - $errors['spam'] = $spam_msg; | |
| 571 | - } else { | |
| 572 | - $is_spam = FrmAntiSpamController::is_spam( $values ); | |
| 573 | - | |
| 574 | - if ( $is_spam ) { | |
| 575 | - $errors['spam'] = $is_spam; | |
| 576 | - } | |
| 255 | + $errors['spam'] = __( 'Your entry appears to be spam!', 'formidable' ); | |
| 256 | + } elseif ( self::blacklist_check( $values ) ) { | |
| 257 | + $errors['spam'] = __( 'Your entry appears to be blocked spam!', 'formidable' ); | |
| 577 | 258 | } |
| 578 | 259 | |
| 579 | 260 | if ( isset( $errors['spam'] ) || self::form_is_in_progress( $values ) ) { |
| 580 | 261 | return; |
| @@ -590,9 +271,8 @@ | ||
| 590 | 271 | * |
| 591 | 272 | * @since 5.0.13 |
| 592 | 273 | * |
| 593 | 274 | * @param array $values The values. |
| 594 | - * | |
| 595 | 275 | * @return bool |
| 596 | 276 | */ |
| 597 | 277 | private static function form_is_in_progress( $values ) { |
| 598 | 278 | return FrmAppHelper::pro_is_installed() && |
| @@ -601,10 +281,9 @@ | ||
| 601 | 281 | } |
| 602 | 282 | |
| 603 | 283 | /** |
| 604 | 284 | * @param int $form_id |
| 605 | - * | |
| 606 | - * @return bool|string | |
| 285 | + * @return boolean | |
| 607 | 286 | */ |
| 608 | 287 | private static function is_antispam_check( $form_id ) { |
| 609 | 288 | $aspm = new FrmAntiSpam( $form_id ); |
| 610 | 289 | return $aspm->validate(); |
| @@ -611,10 +290,9 @@ | ||
| 611 | 290 | } |
| 612 | 291 | |
| 613 | 292 | /** |
| 614 | 293 | * @param array $values |
| 615 | - * | |
| 616 | - * @return bool | |
| 294 | + * @return boolean | |
| 617 | 295 | */ |
| 618 | 296 | private static function is_honeypot_spam( $values ) { |
| 619 | 297 | $honeypot = new FrmHoneypot( $values['form_id'] ); |
| 620 | 298 | return ! $honeypot->validate(); |
| @@ -620,9 +298,9 @@ | ||
| 620 | 298 | return ! $honeypot->validate(); |
| 621 | 299 | } |
| 622 | 300 | |
| 623 | 301 | /** |
| 624 | - * @return bool | |
| 302 | + * @return boolean | |
| 625 | 303 | */ |
| 626 | 304 | private static function is_spam_bot() { |
| 627 | 305 | $ip = FrmAppHelper::get_ip_address(); |
| 628 | 306 | |
| @@ -630,10 +308,9 @@ | ||
| 630 | 308 | } |
| 631 | 309 | |
| 632 | 310 | /** |
| 633 | 311 | * @param array $values |
| 634 | - * | |
| 635 | - * @return bool | |
| 312 | + * @return boolean | |
| 636 | 313 | */ |
| 637 | 314 | private static function is_akismet_spam( $values ) { |
| 638 | 315 | global $wpcom_api_key; |
| 639 | 316 | |
| @@ -641,9 +318,8 @@ | ||
| 641 | 318 | } |
| 642 | 319 | |
| 643 | 320 | /** |
| 644 | 321 | * @param int $form_id |
| 645 | - * | |
| 646 | 322 | * @return bool |
| 647 | 323 | */ |
| 648 | 324 | private static function is_akismet_enabled_for_user( $form_id ) { |
| 649 | 325 | $form = FrmForm::getOne( $form_id ); |
| @@ -650,25 +326,62 @@ | ||
| 650 | 326 | |
| 651 | 327 | return ( ! empty( $form->options['akismet'] ) && ( $form->options['akismet'] !== 'logged' || ! is_user_logged_in() ) ); |
| 652 | 328 | } |
| 653 | 329 | |
| 330 | + public static function blacklist_check( $values ) { | |
| 331 | + if ( ! apply_filters( 'frm_check_blacklist', true, $values ) ) { | |
| 332 | + return false; | |
| 333 | + } | |
| 334 | + | |
| 335 | + $mod_keys = trim( self::get_disallowed_words() ); | |
| 336 | + if ( empty( $mod_keys ) ) { | |
| 337 | + return false; | |
| 338 | + } | |
| 339 | + | |
| 340 | + $content = FrmEntriesHelper::entry_array_to_string( $values ); | |
| 341 | + if ( empty( $content ) ) { | |
| 342 | + return false; | |
| 343 | + } | |
| 344 | + | |
| 345 | + self::prepare_values_for_spam_check( $values ); | |
| 346 | + $ip = FrmAppHelper::get_ip_address(); | |
| 347 | + $user_agent = FrmAppHelper::get_server_value( 'HTTP_USER_AGENT' ); | |
| 348 | + $user_info = self::get_spam_check_user_info( $values ); | |
| 349 | + | |
| 350 | + return self::check_disallowed_words( $user_info['comment_author'], $user_info['comment_author_email'], $user_info['comment_author_url'], $content, $ip, $user_agent ); | |
| 351 | + } | |
| 352 | + | |
| 654 | 353 | /** |
| 655 | - * Checks spam using WordPress disallowed words and Frm denylist. | |
| 354 | + * For WP 5.5 compatibility. | |
| 656 | 355 | * |
| 657 | - * @param array $values Entry values. | |
| 356 | + * @since 4.06.02 | |
| 357 | + */ | |
| 358 | + private static function check_disallowed_words( $author, $email, $url, $content, $ip, $user_agent ) { | |
| 359 | + if ( function_exists( 'wp_check_comment_disallowed_list' ) ) { | |
| 360 | + return wp_check_comment_disallowed_list( $author, $email, $url, $content, $ip, $user_agent ); | |
| 361 | + } else { | |
| 362 | + return wp_blacklist_check( $author, $email, $url, $content, $ip, $user_agent ); | |
| 363 | + } | |
| 364 | + } | |
| 365 | + | |
| 366 | + /** | |
| 367 | + * For WP 5.5 compatibility. | |
| 658 | 368 | * |
| 659 | - * @return bool | |
| 369 | + * @since 4.06.02 | |
| 660 | 370 | */ |
| 661 | - public static function blacklist_check( $values ) { | |
| 662 | - return FrmAntiSpamController::contains_wp_disallowed_words( $values ) || FrmAntiSpamController::is_denylist_spam( $values ); | |
| 371 | + private static function get_disallowed_words() { | |
| 372 | + $keys = get_option( 'disallowed_keys' ); | |
| 373 | + if ( false === $keys ) { | |
| 374 | + // Fallback for WP < 5.5. | |
| 375 | + $keys = get_option( 'blacklist_keys' ); | |
| 376 | + } | |
| 377 | + return $keys; | |
| 663 | 378 | } |
| 664 | 379 | |
| 665 | 380 | /** |
| 666 | 381 | * Check entries for Akismet spam |
| 667 | 382 | * |
| 668 | - * @param array $values Entry values. | |
| 669 | - * | |
| 670 | - * @return bool true if is spam | |
| 383 | + * @return boolean true if is spam | |
| 671 | 384 | */ |
| 672 | 385 | public static function akismet( $values ) { |
| 673 | 386 | if ( empty( $values['item_meta'] ) ) { |
| 674 | 387 | return false; |
| @@ -690,18 +403,13 @@ | ||
| 690 | 403 | |
| 691 | 404 | $query_string = _http_build_query( $datas, '', '&' ); |
| 692 | 405 | $response = Akismet::http_post( $query_string, 'comment-check' ); |
| 693 | 406 | |
| 694 | - return ( is_array( $response ) && $response[1] === 'true' ); | |
| 407 | + return ( is_array( $response ) && $response[1] == 'true' ); | |
| 695 | 408 | } |
| 696 | 409 | |
| 697 | 410 | /** |
| 698 | 411 | * @since 2.0 |
| 699 | - * | |
| 700 | - * @param array $datas The array of values being sent to Akismet. | |
| 701 | - * @param array $values Entry values. | |
| 702 | - * | |
| 703 | - * @return void | |
| 704 | 412 | */ |
| 705 | 413 | private static function parse_akismet_array( &$datas, $values ) { |
| 706 | 414 | self::add_site_info_to_akismet( $datas ); |
| 707 | 415 | self::add_server_values_to_akismet( $datas ); |
| @@ -706,19 +414,13 @@ | ||
| 706 | 414 | self::add_site_info_to_akismet( $datas ); |
| 707 | 415 | self::add_server_values_to_akismet( $datas ); |
| 708 | 416 | |
| 709 | 417 | self::prepare_values_for_spam_check( $values ); |
| 710 | - self::skip_adding_values_to_akismet( $values ); | |
| 711 | 418 | |
| 712 | 419 | self::add_user_info_to_akismet( $datas, $values ); |
| 713 | 420 | self::add_comment_content_to_akismet( $datas, $values ); |
| 714 | 421 | } |
| 715 | 422 | |
| 716 | - /** | |
| 717 | - * @param array $datas | |
| 718 | - * | |
| 719 | - * @return void | |
| 720 | - */ | |
| 721 | 423 | private static function add_site_info_to_akismet( &$datas ) { |
| 722 | 424 | $datas['blog'] = FrmAppHelper::site_url(); |
| 723 | 425 | $datas['user_ip'] = preg_replace( '/[^0-9., ]/', '', FrmAppHelper::get_ip_address() ); |
| 724 | 426 | $datas['user_agent'] = FrmAppHelper::get_server_value( 'HTTP_USER_AGENT' ); |
| @@ -730,14 +432,8 @@ | ||
| 730 | 432 | $datas['is_test'] = 'true'; |
| 731 | 433 | } |
| 732 | 434 | } |
| 733 | 435 | |
| 734 | - /** | |
| 735 | - * @param array $datas | |
| 736 | - * @param array $values | |
| 737 | - * | |
| 738 | - * @return void | |
| 739 | - */ | |
| 740 | 436 | private static function add_user_info_to_akismet( &$datas, $values ) { |
| 741 | 437 | $user_info = self::get_spam_check_user_info( $values ); |
| 742 | 438 | $datas = $datas + $user_info; |
| 743 | 439 | |
| @@ -749,15 +445,13 @@ | ||
| 749 | 445 | /** |
| 750 | 446 | * Gets user info for Akismet spam check. |
| 751 | 447 | * |
| 752 | 448 | * @since 5.0.13 Separate code for guest. Handle value of embedded|repeater. |
| 753 | - * @since 6.21 This changed from private to public. | |
| 754 | 449 | * |
| 755 | 450 | * @param array $values Entry values after running through {@see FrmEntryValidate::prepare_values_for_spam_check()}. |
| 756 | - * | |
| 757 | 451 | * @return array |
| 758 | 452 | */ |
| 759 | - public static function get_spam_check_user_info( $values ) { | |
| 453 | + private static function get_spam_check_user_info( $values ) { | |
| 760 | 454 | if ( ! is_user_logged_in() ) { |
| 761 | 455 | return self::get_spam_check_user_info_for_guest( $values ); |
| 762 | 456 | } |
| 763 | 457 | |
| @@ -777,9 +471,8 @@ | ||
| 777 | 471 | * |
| 778 | 472 | * @since 5.0.13 |
| 779 | 473 | * |
| 780 | 474 | * @param array $values Entry values after flattened. |
| 781 | - * | |
| 782 | 475 | * @return array |
| 783 | 476 | */ |
| 784 | 477 | private static function get_spam_check_user_info_for_guest( $values ) { |
| 785 | 478 | $datas = array( |
| @@ -811,16 +504,13 @@ | ||
| 811 | 504 | * |
| 812 | 505 | * @param array $datas Guest data. |
| 813 | 506 | * @param array $values The values. |
| 814 | 507 | * @param int|null $custom_index Custom index (or field ID). |
| 815 | - * | |
| 816 | - * @return void | |
| 817 | 508 | */ |
| 818 | 509 | private static function recursive_add_akismet_guest_info( &$datas, $values, $custom_index = null ) { |
| 819 | 510 | foreach ( $values as $index => $value ) { |
| 820 | 511 | if ( ! $datas['missing_keys'] ) { |
| 821 | - // Found all info. | |
| 822 | - return; | |
| 512 | + return; // Found all info. | |
| 823 | 513 | } |
| 824 | 514 | |
| 825 | 515 | if ( is_array( $value ) ) { |
| 826 | 516 | self::recursive_add_akismet_guest_info( $datas, $value, $index ); |
| @@ -827,12 +517,10 @@ | ||
| 827 | 517 | continue; |
| 828 | 518 | } |
| 829 | 519 | |
| 830 | 520 | $field_id = ! is_null( $custom_index ) ? $custom_index : $index; |
| 831 | - | |
| 832 | 521 | foreach ( $datas['missing_keys'] as $key_index => $key ) { |
| 833 | - $found = self::is_akismet_guest_info_value( $key, $value, $field_id, $datas['name_field_ids'], $values ); | |
| 834 | - | |
| 522 | + $found = self::is_akismet_guest_info_value( $key, $value, $field_id, $datas['name_field_ids'] ); | |
| 835 | 523 | if ( $found ) { |
| 836 | 524 | $datas[ $key ] = $value; |
| 837 | 525 | $datas['frm_duplicated'][] = $field_id; |
| 838 | 526 | unset( $datas['missing_keys'][ $key_index ] ); |
| @@ -837,9 +525,9 @@ | ||
| 837 | 525 | $datas['frm_duplicated'][] = $field_id; |
| 838 | 526 | unset( $datas['missing_keys'][ $key_index ] ); |
| 839 | 527 | } |
| 840 | 528 | } |
| 841 | - }//end foreach | |
| 529 | + } | |
| 842 | 530 | } |
| 843 | 531 | |
| 844 | 532 | /** |
| 845 | 533 | * Checks if given value is an akismet guest info. |
| @@ -849,13 +537,11 @@ | ||
| 849 | 537 | * @param string $key Guest info key. |
| 850 | 538 | * @param string $value Value to check. |
| 851 | 539 | * @param int $field_id Field ID. |
| 852 | 540 | * @param array $name_field_ids Name field IDs. |
| 853 | - * @param array $values Array of posted values. | |
| 854 | - * | |
| 855 | 541 | * @return bool |
| 856 | 542 | */ |
| 857 | - private static function is_akismet_guest_info_value( $key, &$value, $field_id, $name_field_ids, $values ) { | |
| 543 | + private static function is_akismet_guest_info_value( $key, $value, $field_id, $name_field_ids ) { | |
| 858 | 544 | if ( ! $value || is_numeric( $value ) ) { |
| 859 | 545 | return false; |
| 860 | 546 | } |
| 861 | 547 | |
| @@ -866,73 +552,18 @@ | ||
| 866 | 552 | case 'comment_author_url': |
| 867 | 553 | return 0 === strpos( $value, 'http' ); |
| 868 | 554 | |
| 869 | 555 | case 'comment_author': |
| 870 | - if ( $name_field_ids && in_array( $field_id, $name_field_ids, true ) ) { | |
| 556 | + if ( $name_field_ids ) { | |
| 871 | 557 | // If there is name field in the form, we should always use it as author name. |
| 872 | - return true; | |
| 558 | + return in_array( $field_id, $name_field_ids, true ); | |
| 873 | 559 | } |
| 560 | + return strlen( $value ) < 200; | |
| 561 | + } | |
| 874 | 562 | |
| 875 | - $form_id = FrmAppHelper::get_post_param( 'form_id', 0, 'absint' ); | |
| 876 | - $fields = self::get_name_text_fields( $form_id ); | |
| 877 | - | |
| 878 | - foreach ( $fields as $index => $field ) { | |
| 879 | - if ( 'Name' !== $field->name ) { | |
| 880 | - continue; | |
| 881 | - } | |
| 882 | - | |
| 883 | - if ( isset( $fields[ $index + 1 ] ) && 'Last' === $fields[ $index + 1 ]->name ) { | |
| 884 | - if ( empty( $values[ absint( $fields[ $index + 1 ]->id ) ] ) ) { | |
| 885 | - continue; | |
| 886 | - } | |
| 887 | - | |
| 888 | - $value .= ' ' . $values[ $fields[ $index + 1 ]->id ]; | |
| 889 | - return true; | |
| 890 | - } | |
| 891 | - } | |
| 892 | - }//end switch | |
| 893 | - | |
| 894 | 563 | return false; |
| 895 | 564 | } |
| 896 | 565 | |
| 897 | - /** | |
| 898 | - * Returns fields that have 'Name' and 'Last' as their name. | |
| 899 | - * | |
| 900 | - * @since 6.17 | |
| 901 | - * | |
| 902 | - * @param int $form_id | |
| 903 | - * | |
| 904 | - * @return array | |
| 905 | - */ | |
| 906 | - private static function get_name_text_fields( $form_id ) { | |
| 907 | - $name_text_fields_is_initialized = is_array( self::$name_text_fields ); | |
| 908 | - | |
| 909 | - if ( $name_text_fields_is_initialized && isset( self::$name_text_fields[ $form_id ] ) ) { | |
| 910 | - return self::$name_text_fields[ $form_id ]; | |
| 911 | - } | |
| 912 | - | |
| 913 | - if ( ! $name_text_fields_is_initialized ) { | |
| 914 | - self::$name_text_fields = array(); | |
| 915 | - } | |
| 916 | - self::$name_text_fields[ $form_id ] = FrmDb::get_results( | |
| 917 | - 'frm_fields', | |
| 918 | - array( | |
| 919 | - 'form_id' => $form_id, | |
| 920 | - 'type' => 'text', | |
| 921 | - 'name' => array( 'Name', 'Last' ), | |
| 922 | - ), | |
| 923 | - 'id,name', | |
| 924 | - array( 'order_by' => 'field_order ASC' ) | |
| 925 | - ); | |
| 926 | - | |
| 927 | - return self::$name_text_fields[ $form_id ]; | |
| 928 | - } | |
| 929 | - | |
| 930 | - /** | |
| 931 | - * @param array $datas | |
| 932 | - * | |
| 933 | - * @return void | |
| 934 | - */ | |
| 935 | 566 | private static function add_server_values_to_akismet( &$datas ) { |
| 936 | 567 | foreach ( $_SERVER as $key => $value ) { |
| 937 | 568 | $include_value = is_string( $value ) && ! preg_match( '/^HTTP_COOKIE/', $key ) && preg_match( '/^(HTTP_|REMOTE_ADDR|REQUEST_URI|DOCUMENT_URI)/', $key ); |
| 938 | 569 | |
| @@ -950,10 +581,8 @@ | ||
| 950 | 581 | * @since 5.0.09 |
| 951 | 582 | * |
| 952 | 583 | * @param array $datas The array of values being sent to Akismet. |
| 953 | 584 | * @param array $values Entry values. |
| 954 | - * | |
| 955 | - * @return void | |
| 956 | 585 | */ |
| 957 | 586 | private static function add_comment_content_to_akismet( &$datas, $values ) { |
| 958 | 587 | if ( isset( $datas['frm_duplicated'] ) ) { |
| 959 | 588 | foreach ( $datas['frm_duplicated'] as $index ) { |
| @@ -965,8 +594,10 @@ | ||
| 965 | 594 | } |
| 966 | 595 | unset( $datas['frm_duplicated'] ); |
| 967 | 596 | } |
| 968 | 597 | |
| 598 | + self::skip_adding_values_to_akismet( $values ); | |
| 599 | + | |
| 969 | 600 | $datas['comment_content'] = FrmEntriesHelper::entry_array_to_string( $values ); |
| 970 | 601 | } |
| 971 | 602 | |
| 972 | 603 | /** |
| @@ -974,86 +605,25 @@ | ||
| 974 | 605 | * |
| 975 | 606 | * @since 5.0.09 |
| 976 | 607 | * |
| 977 | 608 | * @param array $values Entry values. |
| 978 | - * | |
| 979 | - * @return void | |
| 980 | 609 | */ |
| 981 | 610 | private static function skip_adding_values_to_akismet( &$values ) { |
| 982 | - $skipped_fields = self::get_akismet_skipped_field_ids( $values ); | |
| 983 | - | |
| 984 | - foreach ( $skipped_fields as $skipped_field ) { | |
| 985 | - if ( ! isset( $values['item_meta'][ $skipped_field->id ] ) ) { | |
| 986 | - continue; | |
| 611 | + $skipped_field_ids = self::get_akismet_skipped_field_ids( $values ); | |
| 612 | + foreach ( $skipped_field_ids as $field_id ) { | |
| 613 | + if ( isset( $values['item_meta'][ $field_id ] ) ) { | |
| 614 | + unset( $values['item_meta'][ $field_id ] ); | |
| 987 | 615 | } |
| 988 | - | |
| 989 | - if ( self::should_really_skip_field( $skipped_field, $values ) ) { | |
| 990 | - unset( $values['item_meta'][ $skipped_field->id ] ); | |
| 991 | - | |
| 992 | - if ( isset( $values['item_meta']['other'][ $skipped_field->id ] ) ) { | |
| 993 | - unset( $values['item_meta']['other'][ $skipped_field->id ] ); | |
| 994 | - } | |
| 995 | - } | |
| 996 | 616 | } |
| 997 | 617 | } |
| 998 | 618 | |
| 999 | 619 | /** |
| 1000 | - * Checks if a skip field should be really skipped. | |
| 1001 | - * | |
| 1002 | - * @since 5.02.04 | |
| 1003 | - * | |
| 1004 | - * @param object $field_data Object contains `id` and `options`. | |
| 1005 | - * @param array $values Entry values. | |
| 1006 | - * | |
| 1007 | - * @return bool | |
| 1008 | - */ | |
| 1009 | - private static function should_really_skip_field( $field_data, $values ) { | |
| 1010 | - if ( empty( $field_data->options ) ) { | |
| 1011 | - // This is skipped field types. | |
| 1012 | - return true; | |
| 1013 | - } | |
| 1014 | - | |
| 1015 | - FrmAppHelper::unserialize_or_decode( $field_data->options ); | |
| 1016 | - | |
| 1017 | - if ( ! $field_data->options ) { | |
| 1018 | - // Check if an error happens when unserializing, or empty options. | |
| 1019 | - return true; | |
| 1020 | - } | |
| 1021 | - | |
| 1022 | - end( $field_data->options ); | |
| 1023 | - $last_key = key( $field_data->options ); | |
| 1024 | - | |
| 1025 | - // If a choice field has no Other option. | |
| 1026 | - if ( is_numeric( $last_key ) || 0 !== strpos( $last_key, 'other_' ) ) { | |
| 1027 | - return true; | |
| 1028 | - } | |
| 1029 | - | |
| 1030 | - // If a choice field has Other option, but Other is not selected. | |
| 1031 | - if ( empty( $values['item_meta']['other'][ $field_data->id ] ) ) { | |
| 1032 | - return true; | |
| 1033 | - } | |
| 1034 | - | |
| 1035 | - // Check if submitted value is same as one of field option. | |
| 1036 | - foreach ( $field_data->options as $option ) { | |
| 1037 | - $option_value = ! is_array( $option ) ? $option : ( $option['value'] ?? '' ); | |
| 1038 | - | |
| 1039 | - if ( $values['item_meta']['other'][ $field_data->id ] === $option_value ) { | |
| 1040 | - return true; | |
| 1041 | - } | |
| 1042 | - } | |
| 1043 | - | |
| 1044 | - return false; | |
| 1045 | - } | |
| 1046 | - | |
| 1047 | - /** | |
| 1048 | 620 | * Gets field IDs that are skipped from sending to Akismet spam check. |
| 1049 | 621 | * |
| 1050 | 622 | * @since 5.0.09 |
| 1051 | 623 | * @since 5.0.13 Move out get_all_form_ids_and_flatten_meta() call and get `form_ids` from `$values`. |
| 1052 | - * @since 5.2.04 This method returns array of object contains `id` and `options` instead of array of `id` only. | |
| 1053 | 624 | * |
| 1054 | 625 | * @param array $values Entry values after running through {@see FrmEntryValidate::prepare_values_for_spam_check()}. |
| 1055 | - * | |
| 1056 | 626 | * @return array |
| 1057 | 627 | */ |
| 1058 | 628 | private static function get_akismet_skipped_field_ids( $values ) { |
| 1059 | 629 | if ( empty( $values['form_ids'] ) ) { |
| @@ -1065,13 +635,20 @@ | ||
| 1065 | 635 | |
| 1066 | 636 | $where = array( |
| 1067 | 637 | array( |
| 1068 | 638 | 'form_id' => $values['form_ids'], |
| 1069 | - 'type' => array_merge( $skipped_types, $has_other_types ), | |
| 639 | + array( | |
| 640 | + array( | |
| 641 | + 'field_options not like' => ';s:5:"other";s:1:"1"', | |
| 642 | + 'type' => $has_other_types, | |
| 643 | + ), | |
| 644 | + 'or' => 1, | |
| 645 | + 'type' => $skipped_types, | |
| 646 | + ), | |
| 1070 | 647 | ), |
| 1071 | 648 | ); |
| 1072 | 649 | |
| 1073 | - return FrmDb::get_results( 'frm_fields', $where, 'id,options' ); | |
| 650 | + return FrmDb::get_col( 'frm_fields', $where ); | |
| 1074 | 651 | } |
| 1075 | 652 | |
| 1076 | 653 | /** |
| 1077 | 654 | * Prepares values array for spam check. |
| @@ -1076,15 +653,12 @@ | ||
| 1076 | 653 | /** |
| 1077 | 654 | * Prepares values array for spam check. |
| 1078 | 655 | * |
| 1079 | 656 | * @since 5.0.13 |
| 1080 | - * @since 6.21 This changed from private to public. | |
| 1081 | 657 | * |
| 1082 | 658 | * @param array $values Entry values. |
| 1083 | - * | |
| 1084 | - * @return void | |
| 1085 | 659 | */ |
| 1086 | - public static function prepare_values_for_spam_check( &$values ) { | |
| 660 | + private static function prepare_values_for_spam_check( &$values ) { | |
| 1087 | 661 | $form_ids = self::get_all_form_ids_and_flatten_meta( $values ); |
| 1088 | 662 | $values['form_ids'] = $form_ids; |
| 1089 | 663 | } |
| 1090 | 664 | |
| @@ -1095,9 +669,8 @@ | ||
| 1095 | 669 | * @since 5.0.09 |
| 1096 | 670 | * @since 5.0.13 Convert name field value to string. |
| 1097 | 671 | * |
| 1098 | 672 | * @param array $values Entry values. |
| 1099 | - * | |
| 1100 | 673 | * @return array Form IDs. |
| 1101 | 674 | */ |
| 1102 | 675 | private static function get_all_form_ids_and_flatten_meta( &$values ) { |
| 1103 | 676 | $values['name_field_ids'] = array(); |
| @@ -1103,12 +676,10 @@ | ||
| 1103 | 676 | $values['name_field_ids'] = array(); |
| 1104 | 677 | |
| 1105 | 678 | // Blacklist check for File field in the old version doesn't contain `form_id`. |
| 1106 | 679 | $form_ids = isset( $values['form_id'] ) ? array( absint( $values['form_id'] ) ) : array(); |
| 1107 | - | |
| 1108 | 680 | foreach ( $values['item_meta'] as $field_id => $value ) { |
| 1109 | - if ( ! is_numeric( $field_id ) ) { | |
| 1110 | - // Maybe `other`. | |
| 681 | + if ( ! is_numeric( $field_id ) ) { // Maybe `other`. | |
| 1111 | 682 | continue; |
| 1112 | 683 | } |
| 1113 | 684 | |
| 1114 | 685 | // Convert name array to string. |
| @@ -1144,16 +715,46 @@ | ||
| 1144 | 715 | |
| 1145 | 716 | $values['name_field_ids'][] = $subsubindex; |
| 1146 | 717 | } |
| 1147 | 718 | |
| 1148 | - if ( is_array( $values['item_meta'][ $subsubindex ] ) ) { | |
| 1149 | - $values['item_meta'][ $subsubindex ][] = $subsubvalue; | |
| 1150 | - } | |
| 719 | + $values['item_meta'][ $subsubindex ][] = $subsubvalue; | |
| 1151 | 720 | } |
| 1152 | - }//end foreach | |
| 721 | + } | |
| 1153 | 722 | |
| 1154 | 723 | unset( $values['item_meta'][ $field_id ] ); |
| 1155 | - }//end foreach | |
| 724 | + } | |
| 1156 | 725 | |
| 1157 | 726 | return $form_ids; |
| 727 | + } | |
| 728 | + | |
| 729 | + /** | |
| 730 | + * @deprecated 3.0 | |
| 731 | + * @codeCoverageIgnore | |
| 732 | + */ | |
| 733 | + public static function validate_url_field( &$errors, $field, $value, $args ) { | |
| 734 | + FrmDeprecated::validate_url_field( $errors, $field, $value, $args ); | |
| 735 | + } | |
| 736 | + | |
| 737 | + /** | |
| 738 | + * @deprecated 3.0 | |
| 739 | + * @codeCoverageIgnore | |
| 740 | + */ | |
| 741 | + public static function validate_email_field( &$errors, $field, $value, $args ) { | |
| 742 | + FrmDeprecated::validate_email_field( $errors, $field, $value, $args ); | |
| 743 | + } | |
| 744 | + | |
| 745 | + /** | |
| 746 | + * @deprecated 3.0 | |
| 747 | + * @codeCoverageIgnore | |
| 748 | + */ | |
| 749 | + public static function validate_number_field( &$errors, $field, $value, $args ) { | |
| 750 | + FrmDeprecated::validate_number_field( $errors, $field, $value, $args ); | |
| 751 | + } | |
| 752 | + | |
| 753 | + /** | |
| 754 | + * @deprecated 3.0 | |
| 755 | + * @codeCoverageIgnore | |
| 756 | + */ | |
| 757 | + public static function validate_recaptcha( &$errors, $field, $args ) { | |
| 758 | + FrmDeprecated::validate_recaptcha( $errors, $field, $args ); | |
| 1158 | 759 | } |
| 1159 | 760 | } |
