MyFavMirrors
/
MeshCentral
mirror of https://github.com/Ylianst/MeshCentral.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 0.6.30

This commit is contained in:
Ylian Saint-Hilaire 2020-09-09 02:14:35 -07:00
parent 166ec989e2
commit ff51e2b329
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "meshcentral", "name": "meshcentral",
"version": "0.6.29", "version": "0.6.30",
"keywords": [ "keywords": [
"Remote Device Management", "Remote Device Management",
"Remote Device Monitoring", "Remote Device Monitoring",

18
views/default.handlebars
View File

@ -8272,7 +8272,14 @@
if (event.etype == 'user') icon = 'm2'; if (event.etype == 'user') icon = 'm2';
if (event.etype == 'server') icon = 'si3'; if (event.etype == 'server') icon = 'si3';
var msg = EscapeHtml(event.msg).split('(R)').join('®'); var msg;
if ((event.msgid == null) || (eventsMessageId[event.msgid] == null)) {
msg = EscapeHtml(event.msg).split('(R)').join('®');
} else {
msg = eventsMessageId[event.msgid];
if (event.msgArgs != null) { for (var i in event.msgArgs) { msg = msg.split('{' + i + '}').join(event.msgArgs[i]); } }
msg = EscapeHtml(msg).split('(R)').join('®');
}
if (event.username) { if (event.username) {
if ((userinfo.siteadmin & 2) && (event.userid)) { if ((userinfo.siteadmin & 2) && (event.userid)) {
msg = '<a href=# onclick=\'gotoUser("' + encodeURIComponentEx(event.userid) + '");haltEvent(event);\'>' + EscapeHtml(event.username) + '</a> &rarr; ' + msg; msg = '<a href=# onclick=\'gotoUser("' + encodeURIComponentEx(event.userid) + '");haltEvent(event);\'>' + EscapeHtml(event.username) + '</a> &rarr; ' + msg;
@ -12243,7 +12250,14 @@
if (event.etype == 'user') icon = 'm2'; if (event.etype == 'user') icon = 'm2';
if (event.etype == 'server') icon = 'si3'; if (event.etype == 'server') icon = 'si3';
var msg = EscapeHtml(event.msg).split('(R)').join('&reg;'); var msg;
if ((event.msgid == null) || (eventsMessageId[event.msgid] == null)) {
msg = EscapeHtml(event.msg).split('(R)').join('&reg;');
} else {
msg = eventsMessageId[event.msgid];
if (event.msgArgs != null) { for (var i in event.msgArgs) { msg = msg.split('{' + i + '}').join(event.msgArgs[i]); } }
msg = EscapeHtml(msg).split('(R)').join('&reg;');
}
if (event.nodeid) { if (event.nodeid) {
var node = getNodeFromId(event.nodeid); var node = getNodeFromId(event.nodeid);
if (node != null) { if (node != null) {