frodovdr/raspap-webgui
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2025-03-01 10:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modify validateDHCPInput() return status object

Browse Source
This commit is contained in:
billz 2023-11-09 15:38:13 +00:00
parent 273f2ce22e
commit e86e52f471
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
includes/dhcp.php
View File

@ -95,7 +95,9 @@ function saveDHCPConfig($status)
if (empty($errors)) { if (empty($errors)) {
$return = updateDHCPConfig($iface,$status); $return = updateDHCPConfig($iface,$status);
} else { } else {
$status->addMessage($errors, 'danger'); foreach ($errors as $error) {
$status->addMessage($error, 'danger');
}
} }
if ($return == 1) { if ($return == 1) {
$status->addMessage('Dnsmasq configuration failed to be updated.', 'danger'); $status->addMessage('Dnsmasq configuration failed to be updated.', 'danger');
@ -118,41 +120,42 @@ function saveDHCPConfig($status)
/** /**
* Validates DHCP user input from the $_POST object * Validates DHCP user input from the $_POST object
* *
* @return string $errors * @return array $errors
*/ */
function validateDHCPInput() function validateDHCPInput()
{ {
$errors = [];
define('IFNAMSIZ', 16); define('IFNAMSIZ', 16);
$iface = $_POST['interface']; $iface = $_POST['interface'];
if (!preg_match('/^[^\s\/\\0]+$/', $iface) if (!preg_match('/^[^\s\/\\0]+$/', $iface)
|| strlen($iface) >= IFNAMSIZ || strlen($iface) >= IFNAMSIZ
) { ) {
$errors .= _('Invalid interface name.').'<br />'.PHP_EOL; $errors[] = _('Invalid interface name.');
} }
if (!filter_var($_POST['StaticIP'], FILTER_VALIDATE_IP) && !empty($_POST['StaticIP'])) { if (!filter_var($_POST['StaticIP'], FILTER_VALIDATE_IP) && !empty($_POST['StaticIP'])) {
$errors .= _('Invalid static IP address.').'<br />'.PHP_EOL; $errors[] = _('Invalid static IP address.');
} }
if (!filter_var($_POST['SubnetMask'], FILTER_VALIDATE_IP) && !empty($_POST['SubnetMask'])) { if (!filter_var($_POST['SubnetMask'], FILTER_VALIDATE_IP) && !empty($_POST['SubnetMask'])) {
$errors .= _('Invalid subnet mask.').'<br />'.PHP_EOL; $errors[] = _('Invalid subnet mask.');
} }
if (!filter_var($_POST['DefaultGateway'], FILTER_VALIDATE_IP) && !empty($_POST['DefaultGateway'])) { if (!filter_var($_POST['DefaultGateway'], FILTER_VALIDATE_IP) && !empty($_POST['DefaultGateway'])) {
$errors .= _('Invalid default gateway.').'<br />'.PHP_EOL; $errors[] = _('Invalid default gateway.');
} }
if (($_POST['dhcp-iface'] == "1")) { if (($_POST['dhcp-iface'] == "1")) {
if (!filter_var($_POST['RangeStart'], FILTER_VALIDATE_IP) && !empty($_POST['RangeStart'])) { if (!filter_var($_POST['RangeStart'], FILTER_VALIDATE_IP) && !empty($_POST['RangeStart'])) {
$errors .= _('Invalid DHCP range start.').'<br />'.PHP_EOL; $errors[] = _('Invalid DHCP range start.');
} }
if (!filter_var($_POST['RangeEnd'], FILTER_VALIDATE_IP) && !empty($_POST['RangeEnd'])) { if (!filter_var($_POST['RangeEnd'], FILTER_VALIDATE_IP) && !empty($_POST['RangeEnd'])) {
$errors .= _('Invalid DHCP range end.').'<br />'.PHP_EOL; $errors[] = _('Invalid DHCP range end.');
} }
if (!ctype_digit($_POST['RangeLeaseTime']) && $_POST['RangeLeaseTimeUnits'] !== 'i') { if (!ctype_digit($_POST['RangeLeaseTime']) && $_POST['RangeLeaseTimeUnits'] !== 'i') {
$errors .= _('Invalid DHCP lease time, not a number.').'<br />'.PHP_EOL; $errors[] = _('Invalid DHCP lease time, not a number.');
} }
if (!in_array($_POST['RangeLeaseTimeUnits'], array('m', 'h', 'd', 'i'))) { if (!in_array($_POST['RangeLeaseTimeUnits'], array('m', 'h', 'd', 'i'))) {
$errors .= _('Unknown DHCP lease time unit.').'<br />'.PHP_EOL; $errors[] = _('Unknown DHCP lease time unit.');
} }
if ($_POST['Metric'] !== '' && !ctype_digit($_POST['Metric'])) { if ($_POST['Metric'] !== '' && !ctype_digit($_POST['Metric'])) {
$errors .= _('Invalid metric value, not a number.').'<br />'.PHP_EOL; $errors[] = _('Invalid metric value, not a number.');
} }
} }
return $errors; return $errors;