Version 0.6.30
Ylian Saint-Hilaire committed
Sep 9, 2020 at 02:14 UTC
d5ddbd924fc76bfff36bed86876a4244e5ed6c73
2 files changed
+17
-3
package.json
+1
-1
@@ -1,6 +1,6 @@
1
{
2
"name": "meshcentral",
3
- "version": "0.6.29",
3
+ "version": "0.6.30",
4
"keywords": [
5
"Remote Device Management",
6
"Remote Device Monitoring",
views/default.handlebars
+16
-2
@@ -8272,7 +8272,14 @@
8272
if (event.etype == 'user') icon = 'm2';
8273
if (event.etype == 'server') icon = 'si3';
8274
8275
- var msg = EscapeHtml(event.msg).split('(R)').join('®');
8275
+ var msg;
8276
+ if ((event.msgid == null) || (eventsMessageId[event.msgid] == null)) {
8277
+ msg = EscapeHtml(event.msg).split('(R)').join('®');
8278
+ } else {
8279
+ msg = eventsMessageId[event.msgid];
8280
+ if (event.msgArgs != null) { for (var i in event.msgArgs) { msg = msg.split('{' + i + '}').join(event.msgArgs[i]); } }
8281
+ msg = EscapeHtml(msg).split('(R)').join('®');
8282
+ }
8283
if (event.username) {
8284
if ((userinfo.siteadmin & 2) && (event.userid)) {
8285
msg = '<a href=# onclick=\'gotoUser("' + encodeURIComponentEx(event.userid) + '");haltEvent(event);\'>' + EscapeHtml(event.username) + '</a> → ' + msg;
@@ -12243,7 +12250,14 @@
12250
if (event.etype == 'user') icon = 'm2';
12251
if (event.etype == 'server') icon = 'si3';
12252
12246
- var msg = EscapeHtml(event.msg).split('(R)').join('®');
12253
+ var msg;
12254
+ if ((event.msgid == null) || (eventsMessageId[event.msgid] == null)) {
12255
+ msg = EscapeHtml(event.msg).split('(R)').join('®');
12256
+ } else {
12257
+ msg = eventsMessageId[event.msgid];
12258
+ if (event.msgArgs != null) { for (var i in event.msgArgs) { msg = msg.split('{' + i + '}').join(event.msgArgs[i]); } }
12259
+ msg = EscapeHtml(msg).split('(R)').join('®');
12260
+ }
12261
if (event.nodeid) {
12262
var node = getNodeFromId(event.nodeid);
12263
if (node != null) {