From 15b8288610f0be1ece605c17830264c616c0c356 Mon Sep 17 00:00:00 2001 From: Paul Donald Date: Sat, 25 Apr 2026 14:32:00 +0200 Subject: [PATCH] luci-app-ocserv: correct JSON user data follow-up to 4a2623038a04e8ead9b825de332b498d54e4aa78 Should help users like #8571 Signed-off-by: Paul Donald --- .../htdocs/luci-static/resources/view/ocserv/users.js | 8 ++++---- .../resources/view/status/include/80_ocserv.js | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/applications/luci-app-ocserv/htdocs/luci-static/resources/view/ocserv/users.js b/applications/luci-app-ocserv/htdocs/luci-static/resources/view/ocserv/users.js index d8477b05af..6ff9202f9c 100644 --- a/applications/luci-app-ocserv/htdocs/luci-static/resources/view/ocserv/users.js +++ b/applications/luci-app-ocserv/htdocs/luci-static/resources/view/ocserv/users.js @@ -62,11 +62,11 @@ return L.view.extend({ id: entry.ID, user: entry?.Username || entry?.User, group: entry?.Groupname || entry?.Group, - vpn_ip: entry['vpn-ipv4'] || entry.vpn_ip || entry?.['P-t-P IPv4'], - vpn_ip6: entry['vpn-ipv6'] || entry.vpn_ip6 || entry?.['P-t-P IPv6'], - ip: entry?.IPv4 || entry?.IPv6 || entry?.['Remote IP'], + vpn_ip: entry['vpn-ipv4'] || entry.vpn_ip || entry?.IPv4, + vpn_ip6: entry['vpn-ipv6'] || entry.vpn_ip6 || entry?.IPv6, + ip: entry?.['Remote IP'], device: entry?.Device, - time: entry?.raw_connected_at || entry['Connected at'], + time: entry['_Connected at'] || entry?.raw_connected_at, cipher: entry?.Cipher || entry?.['TLS ciphersuite'], status: entry?.Status || entry?.State, tx: entry?._TX || entry?.TX || entry?.tx || entry?.raw_tx, diff --git a/applications/luci-app-ocserv/htdocs/luci-static/resources/view/status/include/80_ocserv.js b/applications/luci-app-ocserv/htdocs/luci-static/resources/view/status/include/80_ocserv.js index 3585fb6ff5..9efaad79f8 100644 --- a/applications/luci-app-ocserv/htdocs/luci-static/resources/view/status/include/80_ocserv.js +++ b/applications/luci-app-ocserv/htdocs/luci-static/resources/view/status/include/80_ocserv.js @@ -49,11 +49,11 @@ return baseclass.extend({ id: entry.ID, user: entry?.Username || entry?.User, group: entry?.Groupname || entry?.Group, - vpn_ip: entry['vpn-ipv4'] || entry.vpn_ip || entry?.['P-t-P IPv4'], - vpn_ip6: entry['vpn-ipv6'] || entry.vpn_ip6 || entry?.['P-t-P IPv6'], - ip: entry?.IPv4 || entry?.IPv6 || entry?.['Remote IP'], + vpn_ip: entry['vpn-ipv4'] || entry.vpn_ip || entry?.IPv4, + vpn_ip6: entry['vpn-ipv6'] || entry.vpn_ip6 || entry?.IPv6, + ip: entry?.['Remote IP'], device: entry?.Device, - time: entry?.raw_connected_at || entry['Connected at'], + time: entry['_Connected at'] || entry?.raw_connected_at, cipher: entry?.Cipher || entry?.['TLS ciphersuite'], status: entry?.Status || entry?.State, tx: entry?._TX || entry?.TX || entry?.tx || entry?.raw_tx,