From fa30a8c1e4ec76e4fe157239632b110f0c6798d1 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Thu, 23 Mar 2023 19:46:00 +0100
Subject: [PATCH] Lobby: Dashboard - fix openvpn status reference

---
 src/www/widgets/include/openvpn.inc        | 2 +-
 src/www/widgets/widgets/openvpn.widget.php | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/www/widgets/include/openvpn.inc b/src/www/widgets/include/openvpn.inc
index 161ee08e7..d6334502c 100644
--- a/src/www/widgets/include/openvpn.inc
+++ b/src/www/widgets/include/openvpn.inc
@@ -1,4 +1,4 @@
 <?php
 
 $openvpn_title = gettext('OpenVPN');
-$openvpn_title_link = 'status_openvpn.php';
+$openvpn_title_link = 'ui/openvpn/status';
diff --git a/src/www/widgets/widgets/openvpn.widget.php b/src/www/widgets/widgets/openvpn.widget.php
index f49fefa59..2acf92c1c 100644
--- a/src/www/widgets/widgets/openvpn.widget.php
+++ b/src/www/widgets/widgets/openvpn.widget.php
@@ -45,9 +45,8 @@ foreach ($openvpn_cfg as $section => &$ovpncfg) {
         // link kill buttons
         $(".act_kill_client").click(function(event){
             event.preventDefault();
-            var port = $(this).data("client-port");
-            var ip = $(this).data("client-ip");
-            $.post('/status_openvpn.php', {action: 'kill', port:port, remipp:ip}, function(data) {
+            let params = {server_id:  $(this).data("client-port"), session_id: $(this).data("client-ip")};
+            $.post('/api/openvpn/service/kill_session/', params, function(data, status){
                 location.reload();
             });
         });
@@ -77,7 +76,7 @@ foreach ($openvpn_cfg as $section => &$ovpncfg) {
             <td><?=$conn['common_name'] ?? '';?><br/><?=$conn['connected_since'] ?? '';?></td>
             <td><?=$conn['real_address'] ?? '';?><br/><?=$conn['virtual_address'] ?? '';?></td>
             <td>
-               <span class="fa fa-times fa-fw act_kill_client" data-client-port="server<?=$server['vpnid'];?>"
+               <span class="fa fa-times fa-fw act_kill_client" data-client-port="<?=$server['vpnid'];?>"
                  data-client-ip="<?=$conn['real_address'];?>"
                  style='cursor:pointer;'
                  title='Kill client connection from <?=$conn['real_address']; ?>'>