Ylianst/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-12-28 08:24:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Ylianst/MeshCentral

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2022-01-31 10:21:22 -08:00
commit ee8c47267d
2 changed files with 438 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
agents/meshcore.js
View File

@ -1071,9 +1071,43 @@ function handleServerCommand(data) {
}
case 'messagebox': {
// Display a message box
if (data.title && data.msg) {
if (data.title && data.msg)
{
MeshServerLogEx(18, [data.title, data.msg], "Displaying message box, title=" + data.title + ", message=" + data.msg, data);
try { require('message-box').create(data.title, data.msg, 120).then(function () { }).catch(function () { }); } catch (ex) { }
if (process.platform == 'win32')
{
if(global._clientmessage)
{
global._clientmessage.addMessage(data.msg);
}
else
{
try
{
require('win-dialog');
var ipr = server_getUserImage(data.userid);
ipr.title = data.title;
ipr.message = data.msg;
ipr.username = data.username;
global._clientmessage = ipr.then(function (img)
{
this.messagebox = require('win-dialog').create(this.title, this.message, this.username, { timeout: 120000, b64Image: img.split(',').pop() });
this.__childPromise.addMessage = this.messagebox.addMessage.bind(this.messagebox);
return (this.messagebox);
});
global._clientmessage.then(function () { global._clientmessage = null; });
}
catch(z)
{
try { require('message-box').create(data.title, data.msg, 120).then(function () { }).catch(function () { }); } catch (ex) { }
}
}
}
else
{
try { require('message-box').create(data.title, data.msg, 120).then(function () { }).catch(function () { }); } catch (ex) { }
}
}
break;
}

636
translate/translate.json
View File

File diff suppressed because it is too large Load Diff