MeshCentral/MeshCommander
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCommander synced 2025-12-06 06:03:20 +00:00
Code Issues Releases Wiki Activity

Added -norecord option

Browse Source
This commit is contained in:
Ylian Saint-Hilaire
2020-08-03 16:35:21 -07:00
parent 2af9875d60
commit ea9fb68287
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
amt-wsman-node-0.2.0.js
View File

@@ -381,7 +381,7 @@ var CreateWsmanComm = function (host, port, user, pass, tls, tlsoptions) {
if (obj.FailAllError == 999) return; if (obj.FailAllError == 999) return;
if (obj.FailAllError != 0) { try { callArgs[1](null, obj.FailAllError, callArgs[2]); } catch (ex) { console.error(ex); } return; } if (obj.FailAllError != 0) { try { callArgs[1](null, obj.FailAllError, callArgs[2]); } catch (ex) { console.error(ex); } return; }
//if (request.status != 200) { try { callArgs[1](data, request.status, callArgs[2]); } catch (ex) { console.error(ex); } return; } //if (request.status != 200) { try { callArgs[1](data, request.status, callArgs[2]); } catch (ex) { console.error(ex); } return; }
try { callArgs[1](data, request.status, callArgs[2]); } catch (ex) { console.error(ex); } try { callArgs[1](data, request.status, callArgs[2]); } catch (ex) { console.error(data, request.status, callArgs[2], ex); }
} }
// Private method // Private method

14
index.html
View File

@@ -2084,6 +2084,10 @@
Q('p24filetable').addEventListener('dragover', p24fileDragOver, false); Q('p24filetable').addEventListener('dragover', p24fileDragOver, false);
Q('p24filetable').addEventListener('dragleave', p24fileDragLeave, false); Q('p24filetable').addEventListener('dragleave', p24fileDragLeave, false);
// ###END###{DesktopInbandFiles} // ###END###{DesktopInbandFiles}
// ###BEGIN###{DesktopRecorder}
if (urlvars && urlvars['norecord']) { QV('id_DeskRecorderTools', false); }
// ###END###{DesktopRecorder}
} }
// ###BEGIN###{PowerControl-Advanced} // ###BEGIN###{PowerControl-Advanced}
@@ -7013,7 +7017,6 @@
} else { } else {
// No active policy, stop the timer // No active policy, stop the timer
xxFilterStatistics[network] = {}; xxFilterStatistics[network] = {};
updateSystemDefense();
StopDefenseStatsTimer(); StopDefenseStatsTimer();
} }
} }
@@ -8519,7 +8522,7 @@
// ###BEGIN###{DesktopRecorder} // ###BEGIN###{DesktopRecorder}
// Toggle desktop session recording // Toggle desktop session recording
function deskRecordSession() { function deskRecordSession() {
if (desktop == null) return; if ((desktop == null) || (urlvars && urlvars['norecord'])) return;
if (desktop.m.recordedData == null) { if (desktop.m.recordedData == null) {
// Start recording // Start recording
if ((desktop.State === 3) && (desktop.m.StartRecording())) { Q('DeskRecordButton').classList.remove('videoIcon'); Q('DeskRecordButton').classList.add('videoIconRed'); } if ((desktop.State === 3) && (desktop.m.StartRecording())) { Q('DeskRecordButton').classList.remove('videoIcon'); Q('DeskRecordButton').classList.add('videoIconRed'); }
@@ -8537,7 +8540,7 @@
// ###BEGIN###{FileSaver} // ###BEGIN###{FileSaver}
// Save the desktop image to file // Save the desktop image to file
function deskSaveImage() { function deskSaveImage() {
if (xxdialogMode || desktop.State != 3) return; if (xxdialogMode || (desktop.State != 3) || (urlvars && urlvars['norecord'])) return;
var n = 'Desktop', d = new Date(); var n = 'Desktop', d = new Date();
if (amtsysstate) { n += '-' + amtsysstate['AMT_GeneralSettings'].response['HostName']; } if (amtsysstate) { n += '-' + amtsysstate['AMT_GeneralSettings'].response['HostName']; }
n += '-' + d.getFullYear() + '-' + ('0' + (d.getMonth() + 1)).slice(-2) + '-' + ('0' + d.getDate()).slice(-2) + '-' + ('0' + d.getHours()).slice(-2) + '-' + ('0' + d.getMinutes()).slice(-2); n += '-' + d.getFullYear() + '-' + ('0' + (d.getMonth() + 1)).slice(-2) + '-' + ('0' + d.getDate()).slice(-2) + '-' + ('0' + d.getHours()).slice(-2) + '-' + ('0' + d.getMinutes()).slice(-2);
@@ -9013,7 +9016,12 @@
} else { } else {
// ###END###{MeshServerConnect} // ###END###{MeshServerConnect}
var ports = portsFromHost(currentcomputer['host'], currentcomputer['tls']); var ports = portsFromHost(currentcomputer['host'], currentcomputer['tls']);
// ###BEGIN###{!Mode-NodeWebkit}
ider.Start(ports.host, ports.redir, amtstack.wsman.comm.user, amtstack.wsman.comm.pass, currentcomputer['tls']); ider.Start(ports.host, ports.redir, amtstack.wsman.comm.user, amtstack.wsman.comm.pass, currentcomputer['tls']);
// ###END###{!Mode-NodeWebkit}
// ###BEGIN###{Mode-NodeWebkit}
ider.Start(ports.host, ports.redir, amtstack.wsman.comm.user, amtstack.wsman.comm.pass, currentcomputer['tls'], wsstack.comm.getPeerCertificateFingerprint(), wsstack.comm.xtlsoptions);
// ###END###{Mode-NodeWebkit}
// ###BEGIN###{MeshServerConnect} // ###BEGIN###{MeshServerConnect}
} }
// ###END###{MeshServerConnect} // ###END###{MeshServerConnect}