diff --git a/MeshCentralServer.njsproj b/MeshCentralServer.njsproj index 292ad440..f3fa7792 100644 --- a/MeshCentralServer.njsproj +++ b/MeshCentralServer.njsproj @@ -45,7 +45,6 @@ - diff --git a/agents/MeshCmd-signed.exe b/agents/MeshCmd-signed.exe index c40aed18..ba073709 100644 Binary files a/agents/MeshCmd-signed.exe and b/agents/MeshCmd-signed.exe differ diff --git a/agents/MeshCmd64-signed.exe b/agents/MeshCmd64-signed.exe index e7e36267..a5a8cf64 100644 Binary files a/agents/MeshCmd64-signed.exe and b/agents/MeshCmd64-signed.exe differ diff --git a/agents/MeshService-signed.exe b/agents/MeshService-signed.exe index 2b4e7885..0ca60564 100644 Binary files a/agents/MeshService-signed.exe and b/agents/MeshService-signed.exe differ diff --git a/agents/MeshService.exe b/agents/MeshService.exe index 87372b53..3121f8eb 100644 Binary files a/agents/MeshService.exe and b/agents/MeshService.exe differ diff --git a/agents/MeshService64-signed.exe b/agents/MeshService64-signed.exe index cf2ed766..4fcf83e0 100644 Binary files a/agents/MeshService64-signed.exe and b/agents/MeshService64-signed.exe differ diff --git a/agents/MeshService64.exe b/agents/MeshService64.exe index b58c8f4d..e512cf71 100644 Binary files a/agents/MeshService64.exe and b/agents/MeshService64.exe differ diff --git a/agents/meshcore-01.js b/agents/meshcore-OldTerminal.js similarity index 99% rename from agents/meshcore-01.js rename to agents/meshcore-OldTerminal.js index 7dd688db..0f3f086d 100644 --- a/agents/meshcore-01.js +++ b/agents/meshcore-OldTerminal.js @@ -1567,7 +1567,8 @@ function createMeshCore(agent) { }); } catch (e) { amtLmsState = -1; amtLms = null; } - // Setup logged in user monitoring + // Setup logged in user monitoring // TODO: This causes a problem on Windows7 + /* try { var userSession = require('user-sessions'); userSession.on('changed', function onUserSessionChanged() { @@ -1585,6 +1586,7 @@ function createMeshCore(agent) { //userSession.on('locked', function (user) { sendConsoleText('[' + (user.Domain ? user.Domain + '\\' : '') + user.Username + '] has LOCKED the desktop'); }); //userSession.on('unlocked', function (user) { sendConsoleText('[' + (user.Domain ? user.Domain + '\\' : '') + user.Username + '] has UNLOCKED the desktop'); }); } catch (ex) { } + */ } obj.stop = function () { diff --git a/agents/meshcore.js b/agents/meshcore.js index 6d3df77d..de15348a 100644 --- a/agents/meshcore.js +++ b/agents/meshcore.js @@ -1012,7 +1012,8 @@ function createMeshCore(agent) { try { switch (process.platform) { case 'win32': - child = require('child_process').execFile(process.env['windir'] + '\\system32\\cmd.exe', ["/c", "start", url], { type: childProcess.SpawnTypes.USER, uid: require('user-sessions').Current().Active[0].SessionId }); + //child = require('child_process').execFile(process.env['windir'] + '\\system32\\cmd.exe', ["/c", "start", url], { type: childProcess.SpawnTypes.USER, uid: require('user-sessions').Current().Active[0].SessionId }); // TODO: Using user-session breaks Win7 + child = require('child_process').execFile(process.env['windir'] + '\\system32\\cmd.exe', ["/c", "start", url], { type: childProcess.SpawnTypes.USER }); break; case 'linux': child = require('child_process').execFile('/usr/bin/xdg-open', ['xdg-open', url], { type: require('child_process').SpawnTypes.DETACHED, uid: require('user-sessions').consoleUid() }); @@ -1055,12 +1056,12 @@ function createMeshCore(agent) { */ case 'openurl': { if (args['_'].length != 1) { response = 'Proper usage: openurl (url)'; } // Display usage - else { if (openUserDesktopUrl(args['_'][0]) == null) { response = 'Failed.'; } else { response = 'Success as ' + require('user-sessions').Current().Active[0].SessionId + '.'; } } + else { if (openUserDesktopUrl(args['_'][0]) == null) { response = 'Failed.'; } else { response = 'Success.'; } } break; } case 'users': { if (meshCoreObj.users == null) { response = 'Active users are unknown.'; } else { response = 'Active Users: ' + meshCoreObj.users.join(', ') + '.'; } - require('user-sessions').enumerateUsers().then(function (u) { for (var i in u) { sendConsoleText(u[i]); } }); + //require('user-sessions').enumerateUsers().then(function (u) { for (var i in u) { sendConsoleText(u[i]); } }); break; } case 'toast': { @@ -1595,7 +1596,8 @@ function createMeshCore(agent) { }); } catch (e) { amtLmsState = -1; amtLms = null; } - // Setup logged in user monitoring + // Setup logged in user monitoring (THIS IS BROKEN IN WIN7) + /* try { var userSession = require('user-sessions'); userSession.on('changed', function onUserSessionChanged() { @@ -1613,6 +1615,7 @@ function createMeshCore(agent) { //userSession.on('locked', function (user) { sendConsoleText('[' + (user.Domain ? user.Domain + '\\' : '') + user.Username + '] has LOCKED the desktop'); }); //userSession.on('unlocked', function (user) { sendConsoleText('[' + (user.Domain ? user.Domain + '\\' : '') + user.Username + '] has UNLOCKED the desktop'); }); } catch (ex) { } + */ } obj.stop = function () { diff --git a/package.json b/package.json index ab485d23..7132d2f0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "0.2.4-h", + "version": "0.2.4-m", "keywords": [ "Remote Management", "Intel AMT", diff --git a/views/default-min.handlebars b/views/default-min.handlebars index eee0fb0d..80cf2f6f 100644 --- a/views/default-min.handlebars +++ b/views/default-min.handlebars @@ -1 +1 @@ - MeshCentral
{{{title}}}
{{{title2}}}

{{{logoutControl}}}

↔
 

\ No newline at end of file + MeshCentral
{{{title}}}
{{{title2}}}

{{{logoutControl}}}

↔
 

\ No newline at end of file