From 495d036d8dfceec88be3ed8dc971aacea8faa7d2 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Mon, 25 Dec 2023 14:26:43 +0100
Subject: [PATCH] Interfaces: Overview - miinor cleanups for
 https://github.com/opnsense/core/issues/6832

o export full overview instead of ifconfig output, for debugging purposes its better to have the full picture
o remove json_encode() from getInterfaceAction() and let the framework do its usual thing...
---
 .../OPNsense/Interfaces/Api/OverviewController.php            | 4 ++--
 src/opnsense/mvc/app/views/OPNsense/Interface/overview.volt   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Interfaces/Api/OverviewController.php b/src/opnsense/mvc/app/controllers/OPNsense/Interfaces/Api/OverviewController.php
index fc447f173..67f74b18a 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Interfaces/Api/OverviewController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Interfaces/Api/OverviewController.php
@@ -255,7 +255,7 @@ class OverviewController extends ApiControllerBase
             }
         }
 
-        return json_encode($result);
+        return $result;
     }
 
     public function reloadInterfaceAction($identifier = null)
@@ -276,6 +276,6 @@ class OverviewController extends ApiControllerBase
         $this->sessionClose();
         $this->response->setRawHeader('Content-Type: application/json');
         $this->response->setRawHeader('Content-Disposition: attachment; filename=ifconfig.json');
-        echo (new Backend())->configdRun('interface list ifconfig');
+        echo json_encode($this->parseIfInfo(null, true));
     }
 }
diff --git a/src/opnsense/mvc/app/views/OPNsense/Interface/overview.volt b/src/opnsense/mvc/app/views/OPNsense/Interface/overview.volt
index d3f7a6567..a457f11ac 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Interface/overview.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Interface/overview.volt
@@ -292,7 +292,7 @@
 
 <div class="tab-content content-box">
     <div id="export-wrapper" class="btn-group">
-        <button id="export" class="btn btn-default" data-toggle="tooltip" title="" type="button" data-original-title="Download raw ifconfig output">
+        <button id="export" class="btn btn-default" data-toggle="tooltip" title="" type="button" data-original-title="Download overview (json)">
             <span class="fa fa-cloud-download"></span>
         </button>
     </div>