luci-app-ocserv: correct JSON user data

follow-up to 4a2623038a04e8ead9b825de332b498d54e4aa78

Should help users like #8571

Signed-off-by: Paul Donald <redacted>

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 d8477b05afc2f5b79bbc7a52d8977c87de2368e2..6ff9202f9cfec9b3356b3948c146e1a37980bb22 100644 (file)
--- 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 3585fb6ff50f061bd25e2ecb8e745edb0db0766c..9efaad79f85e25981ee7be17219bbcfbf850e2c5 100644 (file)
--- 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,