Fixed agent install text option.
Ylian Saint-Hilaire committed
Feb 4, 2022 at 15:02 UTC
2a7b42fe3f70b6b35c0524736ab3c9c4315f7d20
18 files changed
+4
-5
agents/MeshCmd-signed.exe
Binary files a/agents/MeshCmd-signed.exe and b/agents/MeshCmd-signed.exe differ
agents/MeshCmd64-signed.exe
Binary files a/agents/MeshCmd64-signed.exe and b/agents/MeshCmd64-signed.exe differ
agents/MeshService-signed.exe
Binary files a/agents/MeshService-signed.exe and b/agents/MeshService-signed.exe differ
agents/MeshService.exe
Binary files a/agents/MeshService.exe and b/agents/MeshService.exe differ
agents/MeshService64-signed.exe
Binary files a/agents/MeshService64-signed.exe and b/agents/MeshService64-signed.exe differ
agents/MeshService64.exe
Binary files a/agents/MeshService64.exe and b/agents/MeshService64.exe differ
agents/agents-old/MeshCmd-signed.exe
Binary files /dev/null and b/agents/agents-old/MeshCmd-signed.exe differ
agents/agents-old/MeshCmd64-signed.exe
Binary files /dev/null and b/agents/agents-old/MeshCmd64-signed.exe differ
agents/agents-old/MeshService-signed.exe
Binary files /dev/null and b/agents/agents-old/MeshService-signed.exe differ
agents/agents-old/MeshService.exe
Binary files /dev/null and b/agents/agents-old/MeshService.exe differ
agents/agents-old/MeshService64-signed.exe
Binary files /dev/null and b/agents/agents-old/MeshService64-signed.exe differ
agents/agents-old/MeshService64.exe
Binary files /dev/null and b/agents/agents-old/MeshService64.exe differ
agents/codesign-old1.cer
Binary files a/agents/codesign-old1.cer and /dev/null differ
agents/codesign-old2.cer
Binary files a/agents/codesign-old2.cer and /dev/null differ
agents/codesign-old3.cer
Binary files a/agents/codesign-old3.cer and /dev/null differ
agents/codesign.cer
Binary files a/agents/codesign.cer and b/agents/codesign.cer differ
meshcentral.js
+1
-2
@@ -1559,7 +1559,6 @@ function CreateMeshCentralServer(config, args) {
1559
var translations = JSON.parse(obj.fs.readFileSync(translationpath).toString());
1560
if (translations['zh-chs']) { translations['zh-hans'] = translations['zh-chs']; delete translations['zh-chs']; }
1561
if (translations['zh-cht']) { translations['zh-hant'] = translations['zh-cht']; delete translations['zh-cht']; }
1562
- obj.agentTranslations = JSON.stringify(translations);
1562
1563
// If there is domain customizations to the agent strings, do this here.
1564
for (var i in obj.config.domains) {
@@ -1569,7 +1568,7 @@ function CreateMeshCentralServer(config, args) {
1568
for (var j in domainTranslations) { delete domainTranslations[j].description; }
1569
domainTranslations.en.description = obj.config.domains[i].agentcustomization.installtext;
1570
}
1572
- obj.config.domains[i].agentTranslations = domainTranslations;
1571
+ obj.config.domains[i].agentTranslations = JSON.stringify(domainTranslations);
1572
}
1573
} catch (ex) { }
1574
webserver.js
+3
-3
@@ -4949,7 +4949,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
4949
if (domain.agentcustomization.filename != null) { meshsettings += 'fileName=' + domain.agentcustomization.filename + '\r\n'; }
4950
if (domain.agentcustomization.image != null) { meshsettings += 'image=' + domain.agentcustomization.image + '\r\n'; }
4951
}
4952
- if (parent.agentTranslations != null) { meshsettings += 'translation=' + parent.agentTranslations + '\r\n'; } // Translation strings, not for MeshCentral Assistant
4952
+ if (domain.agentTranslations != null) { meshsettings += 'translation=' + domain.agentTranslations + '\r\n'; } // Translation strings, not for MeshCentral Assistant
4953
}
4954
setContentDispositionHeader(res, 'application/octet-stream', meshfilename, null, argentInfo.rname);
4955
if (argentInfo.mtime != null) { res.setHeader('Last-Modified', argentInfo.mtime.toUTCString()); }
@@ -5321,7 +5321,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
5321
if (domain.agentcustomization.filename != null) { meshsettings += 'fileName=' + domain.agentcustomization.filename + '\r\n'; }
5322
if (domain.agentcustomization.image != null) { meshsettings += 'image=' + domain.agentcustomization.image + '\r\n'; }
5323
}
5324
- if (parent.agentTranslations != null) { meshsettings += 'translation=' + parent.agentTranslations + '\r\n'; }
5324
+ if (domain.agentTranslations != null) { meshsettings += 'translation=' + domain.agentTranslations + '\r\n'; }
5325
5326
// Setup the response output
5327
var archive = require('archiver')('zip', { level: 5 }); // Sets the compression method.
@@ -5422,7 +5422,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
5422
if (domain.agentcustomization.filename != null) { meshsettings += 'fileName=' + domain.agentcustomization.filename + '\r\n'; }
5423
if (domain.agentcustomization.image != null) { meshsettings += 'image=' + domain.agentcustomization.image + '\r\n'; }
5424
}
5425
- if (parent.agentTranslations != null) { meshsettings += 'translation=' + parent.agentTranslations + '\r\n'; }
5425
+ if (domain.agentTranslations != null) { meshsettings += 'translation=' + domain.agentTranslations + '\r\n'; }
5426
return meshsettings;
5427
}
5428