Gateways: Single: Migrate to MVC - Import first part of https://github.com/opnsense/core/pull/6808

o fix merge issue, as system_gateways_edit.php is not used in the new version, we do need to make sure it's hooked to the new code in master first. At a first glance dpinger_defaults() is the only missing part now.
This commit is contained in:
Ad Schellevis 2023-10-04 11:28:27 +02:00
parent 8a532bebba
commit a114d6df96

View File

@ -33,7 +33,7 @@ require_once("plugins.inc.d/dpinger.inc");
$gateways = new \OPNsense\Routing\Gateways();
$a_gateways = array_values($gateways->gatewaysIndexedByName(true, false, true));
$dpinger_default = dpinger_defaults();
$dpinger_default = $gateways->getDpingerDefaults();
// form processing
if ($_SERVER['REQUEST_METHOD'] === 'POST') {
@ -200,7 +200,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
/****
/* XXX: dpinger needs to take defaults under consideration
/****/
$dpinger_config = dpinger_defaults();
$dpinger_config = $gateways->getDpingerDefaults();
foreach ($dpinger_config as $prop => $value) {
$dpinger_config[$prop] = !empty($pconfig[$prop]) ? $pconfig[$prop] : $value;
}