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

Coalesce dhcp-option=6 lines, prevents invalid config

Browse Source
This commit is contained in:
billz
2025-08-02 13:13:41 -07:00
parent 63491b17d6
commit 7f2eb6e88f
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/RaspAP/Networking/Hotspot/DnsmasqManager.php
View File

@@ -97,12 +97,19 @@ class DnsmasqManager
}
}
if (!empty($syscfg['dhcp-option'])) {
if (is_array($syscfg['dhcp-option'])) {
foreach ($syscfg['dhcp-option'] as $opt) {
$config[] = 'dhcp-option=' . $opt;
$dhcpOptions = (array) $syscfg['dhcp-option'];
$grouped = [];
foreach ($dhcpOptions as $opt) {
$parts = explode(',', $opt, 2);
if (count($parts) < 2) {
continue; // skip malformed option
}
} else {
$config[] = 'dhcp-option=' . $syscfg['dhcp-option'];
list($code, $value) = $parts;
$grouped[$code][] = $value;
}
foreach ($grouped as $code => $values) {
$config[] = 'dhcp-option=' . $code . ',' . implode(',', $values);
}
}
$config[] = PHP_EOL;
@@ -155,17 +162,17 @@ class DnsmasqManager
foreach ($post_data['server'] as $server) {
$config[] = "server=$server";
}
if ($post_data['DNS1']) {
$config[] = "dhcp-option=6," . $post_data['DNS1'];
if ($post_data['DNS2']) {
$config[] = ','.$post_data['DNS2'];
if (!empty($post_data['DNS1'])) {
$dnsOption = "dhcp-option=6," . $post_data['DNS1'];
if (!empty($post_data['DNS2'])) {
$dnsOption .= ',' . $post_data['DNS2'];
}
$config[]= PHP_EOL;
$config[] = $dnsOption;
}
if ($post_data['dhcp-ignore'] == "1") {
$config[] = 'dhcp-ignore=tag:!known';
}
$config[]= PHP_EOL;
return $config;
}