Fixed recording file name and recording icon. #3207
Ylian Saint-Hilaire committed
Oct 20, 2021 at 10:33 UTC
d0d85feb45f732ed1e4b80338523e34634f211b4
4 files changed
+6
-6
meshdesktopmultiplex.js
+1
-1
@@ -797,7 +797,7 @@ function CreateDesktopMultiplexor(parent, domain, nodeid, func) {
797
if (start == false) { func(false); return; } // Just skip this
798
obj.pendingRecording = 1;
799
var now = new Date(Date.now());
800
- var recFilename = 'desktopSession' + ((domain.id == '') ? '' : '-') + domain.id + '-' + now.getUTCFullYear() + '-' + parent.common.zeroPad(now.getUTCMonth(), 2) + '-' + parent.common.zeroPad(now.getUTCDate(), 2) + '-' + parent.common.zeroPad(now.getUTCHours(), 2) + '-' + parent.common.zeroPad(now.getUTCMinutes(), 2) + '-' + parent.common.zeroPad(now.getUTCSeconds(), 2) + '-' + obj.nodeid.split('/')[2] + '.mcrec'
800
+ var recFilename = 'desktopSession' + ((domain.id == '') ? '' : '-') + domain.id + '-' + now.getUTCFullYear() + '-' + parent.common.zeroPad(now.getUTCMonth() + 1, 2) + '-' + parent.common.zeroPad(now.getUTCDate(), 2) + '-' + parent.common.zeroPad(now.getUTCHours(), 2) + '-' + parent.common.zeroPad(now.getUTCMinutes(), 2) + '-' + parent.common.zeroPad(now.getUTCSeconds(), 2) + '-' + obj.nodeid.split('/')[2] + '.mcrec'
801
var recFullFilename = null;
802
if (domain.sessionrecording.filepath) {
803
try { parent.parent.fs.mkdirSync(domain.sessionrecording.filepath); } catch (e) { }
meshrelay.js
+1
-1
@@ -406,7 +406,7 @@ function CreateMeshRelayEx(parent, ws, req, domain, user, cookie) {
406
var now = new Date(Date.now());
407
var xsessionid = obj.id;
408
if ((typeof xsessionid == 'string') && (xsessionid.startsWith('meshmessenger/node/') == true)) { xsessionid = 'Messenger' }
409
- var recFilename = 'relaysession' + ((domain.id == '') ? '' : '-') + domain.id + '-' + now.getUTCFullYear() + '-' + parent.common.zeroPad(now.getUTCMonth(), 2) + '-' + parent.common.zeroPad(now.getUTCDate(), 2) + '-' + parent.common.zeroPad(now.getUTCHours(), 2) + '-' + parent.common.zeroPad(now.getUTCMinutes(), 2) + '-' + parent.common.zeroPad(now.getUTCSeconds(), 2) + xusername + xdevicename + '-' + xsessionid + (xtextSession ? '.txt' : '.mcrec');
409
+ var recFilename = 'relaysession' + ((domain.id == '') ? '' : '-') + domain.id + '-' + now.getUTCFullYear() + '-' + parent.common.zeroPad(now.getUTCMonth() + 1, 2) + '-' + parent.common.zeroPad(now.getUTCDate(), 2) + '-' + parent.common.zeroPad(now.getUTCHours(), 2) + '-' + parent.common.zeroPad(now.getUTCMinutes(), 2) + '-' + parent.common.zeroPad(now.getUTCSeconds(), 2) + xusername + xdevicename + '-' + xsessionid + (xtextSession ? '.txt' : '.mcrec');
410
var recFullFilename = null;
411
if (domain.sessionrecording.filepath) {
412
try { parent.parent.fs.mkdirSync(domain.sessionrecording.filepath); } catch (e) { }
views/sharing.handlebars
+3
-3
@@ -49,9 +49,9 @@
49
<div class='deskareaicon' title="Toggle View Mode" onclick="toggleAspectRatio(1)">⇲</div>
50
<div class='deskareaicon' title="Rotate Left" onclick="drotate(-1)">↺</div>
51
<div class='deskareaicon' title="Rotate Right" onclick="drotate(1)">↻</div>
52
- <div id="deskRecordIcon" class='deskareaicon' title="Server is recording this session" style="display:none;background-color:red;width:12px;height:12px;border-radius:6px;margin-top:5px"></div>
52
<input id="deskActionsSettings" type="button" value="Settings..." title="Edit remote desktop settings" onkeypress="return false" onkeydown="return false" onclick="showDesktopSettings()" class="mR" />
53
<div id="desktopCustomUiButtons" style="float:left"></div>
54
+ <div id="deskRecordIcon" class='deskareaicon' title="Server is recording this session" style="display:none;background-color:red;width:12px;height:12px;border-radius:6px;margin-top:5px"></div>
55
</div>
56
<div>
57
<div id="idx_deskFullBtn2" onclick=deskToggleFull(event)> ✖</div>
@@ -111,8 +111,8 @@
111
</div>
112
<div class="areaHead" style="position:absolute;top:0;left:0;right:0;height:24px">
113
<div class="toright2">
114
- <div id="p12power" style="margin-top:3px;margin-right:4px"></div>
114
<div id="termRecordIcon" class='deskareaicon' title="Server is recording this session" style="display:none;background-color:red;width:12px;height:12px;border-radius:6px;margin-top:5px;margin-left:5px"></div>
115
+ <div id="p12power" style="margin-top:3px;margin-right:4px;float:right"></div>
116
</div>
117
<div>
118
<span id="connectbutton2span"><input type="button" id="connectbutton2" cmenu="termConnectButton" value="Connect" onclick=connectTerminal(event,1) onkeypress="return false" onkeydown="return false" disabled="disabled" /></span>
@@ -153,8 +153,8 @@
153
<div id="p13toolbar" style="position:absolute;left:0;top:0;right:0;bottom:28px">
154
<div class="areaHead">
155
<div class="toright2">
156
- <div id="p13power" style="margin-top:3px;margin-right:4px"></div>
156
<div id="filesRecordIcon" class='deskareaicon' title="Server is recording this session" style="display:none;background-color:red;width:12px;height:12px;border-radius:6px;margin-top:5px;margin-left:5px"></div>
157
+ <div id="p13power" style="margin-top:3px;margin-right:4px;float:right"></div>
158
</div>
159
<div>
160
<input id=p13Connect value="Connect" onclick=connectFiles(event) type="button" />
webserver.js
+1
-1
@@ -4018,7 +4018,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
4018
4019
if (record == true) {
4020
var now = new Date(Date.now());
4021
- var recFilename = 'relaysession' + ((domain.id == '') ? '' : '-') + domain.id + '-' + now.getUTCFullYear() + '-' + obj.common.zeroPad(now.getUTCMonth(), 2) + '-' + obj.common.zeroPad(now.getUTCDate(), 2) + '-' + obj.common.zeroPad(now.getUTCHours(), 2) + '-' + obj.common.zeroPad(now.getUTCMinutes(), 2) + '-' + obj.common.zeroPad(now.getUTCSeconds(), 2) + '-' + getRandomPassword() + '.mcrec'
4021
+ var recFilename = 'relaysession' + ((domain.id == '') ? '' : '-') + domain.id + '-' + now.getUTCFullYear() + '-' + obj.common.zeroPad(now.getUTCMonth() + 1, 2) + '-' + obj.common.zeroPad(now.getUTCDate(), 2) + '-' + obj.common.zeroPad(now.getUTCHours(), 2) + '-' + obj.common.zeroPad(now.getUTCMinutes(), 2) + '-' + obj.common.zeroPad(now.getUTCSeconds(), 2) + '-' + getRandomPassword() + '.mcrec'
4022
var recFullFilename = null;
4023
if (domain.sessionrecording.filepath) {
4024
try { obj.fs.mkdirSync(domain.sessionrecording.filepath); } catch (e) { }