lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-20 03:16:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui/legacy - support key/value combinations for error messages in do_input_validation() while keeping the old behavior ($reqdfieldsn contains only descriptions for required fields) intact.

Browse Source
This commit is contained in:
Ad Schellevis 2023-12-19 12:03:25 +01:00
parent db8317cfaf
commit 52fe119e0c
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/www/guiconfig.inc
View File

@ -159,12 +159,24 @@ $wlan_modes = array(
'hostap' => 'Access Point'
);
function do_input_validation($postdata, $reqdfields, $reqdfieldsn, &$input_errors)
function do_input_validation($postdata, $reqdfields, $fielddescr, &$input_errors)
{
/* if $fielddescr is a mapping (name => description) we can use it in our errors, otherwise when it only contains descriptions, we need to fetch the name from the required fields */
$fieldnames = [];
foreach ($fielddescr as $seq => $descr) {
if (preg_match('/^\d+$/', $seq)) {
if (isset($reqdfields[$seq])) {
$fieldnames[$reqdfields[$seq]] = $descr;
}
} else {
$fieldnames[$seq] = $descr;
}
}
/* check for bad control characters */
foreach ($postdata as $pn => $pd) {
if (is_string($pd) && preg_match("/[\\x00-\\x08\\x0b\\x0c\\x0e-\\x1f]/", $pd)) {
$input_errors[] = sprintf(gettext("The field %s contains invalid characters."), $pn);
$input_errors[] = sprintf(gettext("The field %s contains invalid characters."), $fieldnames[$pn] ?? $pn);
}
}
@ -180,7 +192,7 @@ function do_input_validation($postdata, $reqdfields, $reqdfieldsn, &$input_error
}
if (!$found) {
$input_errors[] = sprintf(gettext("The field %s is required."), $reqdfieldsn[$i]);
$input_errors[] = sprintf(gettext("The field %s is required."), $fieldnames[$reqdfields[$i]]);
}
}
}