From a7ddcb6e3cc7ce1cd7c19660ccd91d224ebbfe73 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Thu, 11 Apr 2019 13:21:15 +0200 Subject: [PATCH] Routing, gateways. ditch return_gateways_array() usage in system_gateway_groups.php, system_gateway_groups_edit.php for https://github.com/opnsense/core/issues/2279 --- src/www/system_gateway_groups.php | 2 +- src/www/system_gateway_groups_edit.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/www/system_gateway_groups.php b/src/www/system_gateway_groups.php index dc023359e..1e8ef9566 100644 --- a/src/www/system_gateway_groups.php +++ b/src/www/system_gateway_groups.php @@ -35,7 +35,7 @@ require_once("rrd.inc"); $a_gateway_groups = &config_read_array('gateways', 'gateway_group'); $gateways_status = return_gateways_status(); -$a_gateways = return_gateways_array(); +$a_gateways = (new \OPNsense\Routing\Gateways(legacy_interfaces_details()))->gatewaysIndexedByName(); if ($_SERVER['REQUEST_METHOD'] === 'POST') { if (isset($_POST['act']) && $_POST['act'] == "del" ) { diff --git a/src/www/system_gateway_groups_edit.php b/src/www/system_gateway_groups_edit.php index 818d7fc06..3b9f61d50 100644 --- a/src/www/system_gateway_groups_edit.php +++ b/src/www/system_gateway_groups_edit.php @@ -32,7 +32,7 @@ require_once("services.inc"); require_once("interfaces.inc"); $a_gateway_groups = &config_read_array('gateways', 'gateway_group'); -$a_gateways = return_gateways_array(); +$a_gateways = (new \OPNsense\Routing\Gateways(legacy_interfaces_details()))->gatewaysIndexedByName(); if ($_SERVER['REQUEST_METHOD'] === 'GET') { if (isset($_GET['id']) && isset($a_gateway_groups[$_GET['id']])) {