Fixed all .csv save options to be UTF8.
Ylian Saint-Hilaire committed
Jun 25, 2021 at 10:16 UTC
dfd973c629d51a758e4a44430141e058762d429b
2 files changed
+17
-6
MeshCentralServer.njsproj
+1
-1
@@ -193,7 +193,7 @@
193
<Compile Include="public\scripts\amt-wsman-0.2.0.js" />
194
<Compile Include="public\scripts\amt-wsman-ws-0.2.0.js" />
195
<Compile Include="public\scripts\common-0.0.1.js" />
196
- <cls Include="public\scripts\meshcentral.js" />
196
+ <Compile Include="public\scripts\meshcentral.js" />
197
<Compile Include="redirserver.js" />
198
<Compile Include="translate\translate.js" />
199
<Compile Include="ua-parser.js" />
views/default.handlebars
+16
-5
@@ -5198,7 +5198,7 @@
5198
}
5199
csv += '\r\n';
5200
}
5201
- saveAs(new Blob([csv], { type: 'application/octet-stream' }), "devicelist.csv");
5201
+ saveAs(stringToUtf8Blob(csv), "devicelist.csv");
5202
}
5203
return false;
5204
}
@@ -12598,7 +12598,7 @@
12598
if (eventList[i].nodeid) { var node = getNodeFromId(eventList[i].nodeid); if (node && node.name) { nodename = node.name; } }
12599
csv += '"' + eventList[i].time + '","' + printDateTime(new Date(eventList[i].time)) + '","' + eventList[i].etype + '","' + ((eventList[i].action != null) ? eventList[i].action : '') + '","' + ((eventList[i].username != null) ? eventList[i].username : '') + '","' + EscapeHtml(nodename) + '","' + ((eventList[i].msg != null) ? eventList[i].msg : '').split(',').join(' -') + '"\r\n';
12600
}
12601
- saveAs(new Blob([csv], { type: 'application/octet-stream' }), "eventslist.csv");
12601
+ saveAs(stringToUtf8Blob(csv), "eventslist.csv");
12602
return false;
12603
}
12604
@@ -12971,7 +12971,7 @@
12971
}
12972
csv += '"' + users[i]._id + '","' + users[i].name + '","' + (users[i].email ? users[i].email : '') + '","' + (users[i].creation ? new Date(users[i].creation * 1000) : '') + '","' + (users[i].login ? new Date(users[i].login * 1000) : '') + '","' + (users[i].groups ? users[i].groups.join(',') : '') + '","' + (multiFactor ? factors.join(',') : '') + '"\r\n';
12973
}
12974
- saveAs(new Blob([csv], { type: 'application/octet-stream' }), "userlist.csv");
12974
+ saveAs(stringToUtf8Blob(csv), "userlist.csv");
12975
return false;
12976
}
12977
@@ -14957,7 +14957,7 @@
14957
csv += new Date(serverTimelineStats[i].time) + ', ' + serverTimelineStats[i].conn.ca + ', ' + serverTimelineStats[i].conn.cu + ', ' + serverTimelineStats[i].conn.us + ', ' + serverTimelineStats[i].conn.rs + ', ' + (serverTimelineStats[i].conn.am ? serverTimelineStats[i].conn.am : '') + ', ' + serverTimelineStats[i].mem.external + ', ' + serverTimelineStats[i].mem.heapUsed + ', ' + serverTimelineStats[i].mem.heapTotal + ', ' + serverTimelineStats[i].mem.rss + '\r\n';
14958
}
14959
}
14960
- saveAs(new Blob([csv], { type: 'application/octet-stream' }), "ServerStats.csv");
14960
+ saveAs(stringToUtf8Blob(csv), "ServerStats.csv");
14961
}
14962
14963
//
@@ -15028,7 +15028,7 @@
15028
function p41downloadServerTrace() {
15029
var csv = "time, source, message" + '\r\n';
15030
for (var i in serverTrace) { csv += '"' + new Date(serverTrace[i].time).toLocaleTimeString() + '","' + serverTrace[i].source + '","' + serverTrace[i].args.join(', ') + '"\r\n'; }
15031
- saveAs(new Blob([csv], { type: 'application/octet-stream' }), "servertrace.csv");
15031
+ saveAs(stringToUtf8Blob(csv), "servertrace.csv");
15032
return false;
15033
}
15034
@@ -15631,6 +15631,17 @@
15631
}
15632
}
15633
15634
+ // Convert a string into a UTF8 blob with the UTF8 header in front of it.
15635
+ function stringToUtf8Blob(str) {
15636
+ const bytes = new TextEncoder().encode(str);
15637
+ var bytes2 = new Uint8Array(3 + bytes.length);
15638
+ bytes2[0] = 0xEF; // This is the UTF-8 header for CSV files, add it to the start of the file.
15639
+ bytes2[1] = 0xBB;
15640
+ bytes2[2] = 0xBF;
15641
+ for (var i = 0; i < bytes.length; i++) { bytes2[i + 3] = bytes[i]; }
15642
+ return new Blob([bytes2], { type: 'application/octet-stream' }) // application/json;charset=utf-8
15643
+ }
15644
+
15645
function getNodeAmtVersion(node) { if ((node == null) || (node.intelamt == null) || (typeof node.intelamt.ver != 'string')) return 0; var verSplit = node.intelamt.ver.split('.'); if (verSplit.length < 2) return 0; return parseInt(verSplit[0]) + (parseInt(verSplit[1]) / 100); }
15646
function getstore(name, val) { try { if (typeof (localStorage) === 'undefined') return val; var v = localStorage.getItem(name); if ((v == null) || (v == null)) return val; return v; } catch (e) { return val; } }
15647
function addLink(x, f) { return '<span tabindex=0 style=cursor:pointer;text-decoration:none onclick=\'' + f + '\' onkeypress="if (event.key==\'Enter\') {' + f + '} ">' + x + ' <img class=hoverButton src=images/link5.png></span>'; }