diff options
Diffstat (limited to 'src/etc/inc')
-rw-r--r-- | src/etc/inc/globals.inc | 2 | ||||
-rw-r--r-- | src/etc/inc/services.inc | 8 | ||||
-rw-r--r-- | src/etc/inc/upgrade_config.inc | 29 |
3 files changed, 35 insertions, 4 deletions
diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc index d0e0fd5..946cfe6 100644 --- a/src/etc/inc/globals.inc +++ b/src/etc/inc/globals.inc @@ -99,7 +99,7 @@ $g = array( "disablecrashreporter" => false, "crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php", "debug" => false, - "latest_config" => "13.6", + "latest_config" => "13.7", "nopkg_platforms" => array("cdrom"), "minimum_ram_warning" => "101", "minimum_ram_warning_text" => "128 MB", diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc index 4945e8a..2ad38b2 100644 --- a/src/etc/inc/services.inc +++ b/src/etc/inc/services.inc @@ -958,10 +958,11 @@ EOD; $dhcpdconf .= "\n"; if ($dhcpifconf['numberoptions']['item']) { foreach ($dhcpifconf['numberoptions']['item'] as $itemidx => $item) { + $item_value = base64_decode($item['value']); if (empty($item['type']) || $item['type'] == "text") { - $dhcpdconf .= " option custom-{$dhcpif}-{$itemidx} \"{$item['value']}\";\n"; + $dhcpdconf .= " option custom-{$dhcpif}-{$itemidx} \"{$item_value}\";\n"; } else { - $dhcpdconf .= " option custom-{$dhcpif}-{$itemidx} {$item['value']};\n"; + $dhcpdconf .= " option custom-{$dhcpif}-{$itemidx} {$item_value};\n"; } } } @@ -1462,7 +1463,8 @@ EOD; $dhcpdv6conf .= "\n"; if ($dhcpv6ifconf['numberoptions']['item']) { foreach ($dhcpv6ifconf['numberoptions']['item'] as $itemv6idx => $itemv6) { - $dhcpdv6conf .= " option custom-{$dhcpv6if}-{$itemv6idx} \"{$itemv6['value']}\";\n"; + $itemv6_value = base64_decode($itemv6['value']); + $dhcpdv6conf .= " option custom-{$dhcpv6if}-{$itemv6idx} \"{$itemv6_value}\";\n"; } } diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index aa3ec70..dedab7c 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -4285,4 +4285,33 @@ function upgrade_135_to_136() { } } } + +function upgrade_136_to_137() { + global $config; + + if (is_array($config['dhcpd'])) { + foreach ($config['dhcpd'] as &$dhcpd) { + if (!is_array($dhcpd['numberoptions']['item'])) { + continue; + } + + foreach ($dhcpd['numberoptions']['item'] as &$item) { + $item['value'] = base64_encode($item['value']); + } + } + } + + if (is_array($config['dhcpdv6'])) { + foreach ($config['dhcpdv6'] as &$dhcpdv6) { + if (!is_array($dhcpdv6['numberoptions']['item'])) { + continue; + } + + foreach ($dhcpdv6['numberoptions']['item'] as &$item) { + $item['value'] = base64_encode($item['value']); + } + } + } +} + ?> |