fix ~users in active sessions popup #7044
Signed-off-by: si458 <simonsmith5521@gmail.com>
si458 committed
May 20, 2025 at 22:29 UTC
4afe0fe3f9c64774cd840b36034c59a94ec57b2b
3 files changed
+12
-1
views/default-mobile.handlebars
+10
-1
@@ -7631,7 +7631,16 @@
7631
function printDateTime(d) { return d.toLocaleString(args.locale); }
7632
function format(format) { var args = Array.prototype.slice.call(arguments, 1); return format.replace(/{(\d+)}/g, function (match, number) { return typeof args[number] != 'undefined' ? args[number] : match; }); };
7633
function nobreak(x) { return x.split(' ').join(' '); }
7634
- function getUserName(userid) { if (users && users[userid] != null) return users[userid].name; return userid.split('/')[2]; }
7634
+ function getUserName(userid) {
7635
+ var useridsplit = userid.split('/'), userid2 = useridsplit[0] + '/' + useridsplit[1] + '/' + useridsplit[2], guestname = '';
7636
+ if ((useridsplit.length == 4) && (useridsplit[3].startsWith('guest:'))) { guestname = ' - ' + decode_utf8(atob(useridsplit[3].substring(6))); }
7637
+ if (users && users[userid2] != null) { if (users[userid2].realname != null) return (users[userid2].realname + guestname); else return (users[userid2].name + guestname); }
7638
+ if (currentNode && currentNode.links && currentNode.links[userid] && currentNode.links[userid].name != null) { return (currentNode.links[userid].name + guestname); }
7639
+ if (userid == userinfo._id) { return (userinfo.name + guestname); }
7640
+ if (nodes) { for (var a in nodes) { if (nodes[a].links) { for (var b in nodes[a].links) { if (nodes[a].links[b].name && b == userid) return (nodes[a].links[b].name + guestname); } } } }
7641
+ if (meshes) { for (var a in meshes) { if (meshes[a].links) { for (var b in meshes[a].links) { if (meshes[a].links[b].name && b == userid) return (meshes[a].links[b].name + guestname); } } } }
7642
+ return (useridsplit[2] + guestname);
7643
+ }
7644
function addDetailItem(title, value, state) { return '<table style=width:100%><td>' + nobreak(title) + '<td style=text-align:right>' + value + '</table>'; }
7645
function isPrivateIP(a) { return (a.startsWith('10.') || a.startsWith('172.16.') || a.startsWith('192.168.')); }
7646
function encodeURIComponentEx(txt) { return encodeURIComponent(txt).replace(/'/g, '%27'); };
views/default.handlebars
+1
@@ -19349,6 +19349,7 @@
19349
if (currentNode && currentNode.links && currentNode.links[userid] && currentNode.links[userid].name != null) { return (currentNode.links[userid].name + guestname); }
19350
if (userid == userinfo._id) { return (userinfo.name + guestname); }
19351
if (nodes) { for (var a in nodes) { if (nodes[a].links) { for (var b in nodes[a].links) { if (nodes[a].links[b].name && b == userid) return (nodes[a].links[b].name + guestname); } } } }
19352
+ if (meshes) { for (var a in meshes) { if (meshes[a].links) { for (var b in meshes[a].links) { if (meshes[a].links[b].name && b == userid) return (meshes[a].links[b].name + guestname); } } } }
19353
return (useridsplit[2] + guestname);
19354
}
19355
function round(value, precision) { var multiplier = Math.pow(10, precision || 0); return Math.round(value * multiplier) / multiplier; }
views/default3.handlebars
+1
@@ -20668,6 +20668,7 @@
20668
if (currentNode && currentNode.links && currentNode.links[userid] && currentNode.links[userid].name != null) { return (currentNode.links[userid].name + guestname); }
20669
if (userid == userinfo._id) { return (userinfo.name + guestname); }
20670
if (nodes) { for (var a in nodes) { if (nodes[a].links) { for (var b in nodes[a].links) { if (nodes[a].links[b].name && b == userid) return (nodes[a].links[b].name + guestname); } } } }
20671
+ if (meshes) { for (var a in meshes) { if (meshes[a].links) { for (var b in meshes[a].links) { if (meshes[a].links[b].name && b == userid) return (meshes[a].links[b].name + guestname); } } } }
20672
return (useridsplit[2] + guestname);
20673
}
20674
function round(value, precision) { var multiplier = Math.pow(10, precision || 0); return Math.round(value * multiplier) / multiplier; }