Vladimir Bryzgalov
8efb82ca43
Three pilot-surfaced issues in one pass: 1. PhoneParser regex used '\s' in the candidate character class, so a digit on a following flattened line bled into the phone. '+7977 6277470\n1' (phone + trailing checkbox value) parsed as 12 digits, producing '+797762774701'. Replaced '\s' with a literal space so newlines/tabs stop the candidate. 2. Custom-themed forms don't use 'your-name' / 'your-email' keys (washanyanya.ru has text-211 / text-212 / name_user). Added FieldDetector::find_name + find_email as fallbacks. Classifier and MessageFormatter now call them if no standard key matches, so 'Александр' in text-211 is recognised as a cyrillic name and scored / displayed accordingly. 3. FlamingoHelper copied '_from_email' into 'your-email' without validating it. Flamingo derives that meta from whatever field it considers "first"; on phone-first forms it ends up holding the phone number. Now we only copy _from_email if it contains '@', and dropped the _from_name shortcut entirely — FieldDetector handles the name via the actual field values. Tests: +1 FieldDetectorTest (13 cases); +2 PhoneParserTest cases for newline/tab bleeds; +1 ClassifierTest case; +1 MessageFormatterTest case for custom field keys. Full suite 53/53 green. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
57 lines
1.7 KiB
PHP
57 lines
1.7 KiB
PHP
<?php
|
|
declare(strict_types=1);
|
|
|
|
namespace Cf7stg;
|
|
|
|
/**
|
|
* Heuristic detection of name/email/etc. when form field keys are not
|
|
* the standard CF7 ones (your-name, your-email, ...). Used as a fallback
|
|
* for custom-themed forms where fields are called text-211, name_user,
|
|
* и т.п.
|
|
*/
|
|
final class FieldDetector
|
|
{
|
|
/**
|
|
* Scan values for something that plausibly looks like a human name:
|
|
* letters (any script), optional spaces/hyphens/apostrophes/dots,
|
|
* no digits, no URLs, no emails, length 2..80.
|
|
*/
|
|
public static function find_name(array $fields): string
|
|
{
|
|
foreach ($fields as $v) {
|
|
if (is_array($v)) {
|
|
$v = implode(' ', array_map('strval', $v));
|
|
}
|
|
$v = trim((string)$v);
|
|
if ($v === '') continue;
|
|
$len = mb_strlen($v);
|
|
if ($len < 2 || $len > 80) continue;
|
|
if (preg_match('/\d/u', $v)) continue;
|
|
if (preg_match('#https?://|www\.|@#iu', $v)) continue;
|
|
// Must start with a letter and contain only letter-like characters
|
|
if (preg_match('/^\p{L}[\p{L}\s\.\-\']{1,79}$/u', $v)) {
|
|
return $v;
|
|
}
|
|
}
|
|
return '';
|
|
}
|
|
|
|
/**
|
|
* First value that looks like an email address.
|
|
*/
|
|
public static function find_email(array $fields): string
|
|
{
|
|
foreach ($fields as $v) {
|
|
if (is_array($v)) {
|
|
$v = implode(' ', array_map('strval', $v));
|
|
}
|
|
$v = trim((string)$v);
|
|
if ($v === '') continue;
|
|
if (preg_match('/^\S+@\S+\.\S+$/u', $v)) {
|
|
return $v;
|
|
}
|
|
}
|
|
return '';
|
|
}
|
|
}
|