Fixed account name in device sessions.
Ylian Saint-Hilaire committed
Jun 28, 2021 at 13:58 UTC
4b52e0269d707be26a3a5d02e22992bd252e3635
2 files changed
+4
-2
meshagent.js
+1
@@ -1610,6 +1610,7 @@ module.exports.CreateMeshAgent = function (parent, db, ws, req, args, domain) {
1610
// Add the user's real name if present
1611
var u = parent.users[command.userid];
1612
if (u == null) return;
1613
+ if (u.name) { command.name = u.name; }
1614
if (u.realname) { command.realname = u.realname; }
1615
1616
// An agent can only request images of accounts with rights to the device.
views/default.handlebars
+3
-2
@@ -15691,9 +15691,10 @@
15691
function pad2(num) { var s = '00' + num; return s.substr(s.length - 2); }
15692
function encodeURIComponentEx(txt) { return encodeURIComponent(txt).replace(/'/g,'%27'); };
15693
function getUserName(userid) {
15694
- var useridsplit = userid.split('/'), userid2 = userid[0] + '/' + userid[1] + '/' + userid[2], guestname = '';
15694
+ var useridsplit = userid.split('/'), userid2 = useridsplit[0] + '/' + useridsplit[1] + '/' + useridsplit[2], guestname = '';
15695
if ((useridsplit.length == 4) && (useridsplit[3].startsWith('guest:'))) { guestname = ' - ' + decode_utf8(atob(useridsplit[3].substring(6))); }
15696
- if (users && users[userid2] != null) return (users[userid2].name + guestname); return (useridsplit[2] + guestname);
15696
+ if (users && users[userid2] != null) { if (users[userid2].realname != null) return (users[userid2].realname + guestname); else return (users[userid2].name + guestname); }
15697
+ return (useridsplit[2] + guestname);
15698
}
15699
function round(value, precision) { var multiplier = Math.pow(10, precision || 0); return Math.round(value * multiplier) / multiplier; }
15700
function safeNewWindow(url, target) { var newWindow = window.open(url, target, 'noopener,noreferrer'); if (newWindow) { newWindow.opener = null; } }