mirror of
https://github.com/Ylianst/MeshCentral.git
synced 2025-03-13 21:12:53 -04:00
fix logoutOnIdleSessionTimeout spelling and extra translations #6851
Signed-off-by: si458 <simonsmith5521@gmail.com>
This commit is contained in:
parent
b949cecc5f
commit
0e3a6b4915
@ -601,11 +601,11 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
|
|||||||
}
|
}
|
||||||
if (typeof domain.userconsentflags == 'number') { serverinfo.consent = domain.userconsentflags; }
|
if (typeof domain.userconsentflags == 'number') { serverinfo.consent = domain.userconsentflags; }
|
||||||
if ((typeof domain.usersessionidletimeout == 'number') && (domain.usersessionidletimeout > 0)) {serverinfo.timeout = (domain.usersessionidletimeout * 60 * 1000); }
|
if ((typeof domain.usersessionidletimeout == 'number') && (domain.usersessionidletimeout > 0)) {serverinfo.timeout = (domain.usersessionidletimeout * 60 * 1000); }
|
||||||
if (typeof domain.logoutOnIdleSessionTimeout == 'boolean') {
|
if (typeof domain.logoutonidlesessiontimeout == 'boolean') {
|
||||||
serverinfo.logoutOnIdleSessionTimeout = domain.logoutOnIdleSessionTimeout;
|
serverinfo.logoutonidlesessiontimeout = domain.logoutonidlesessiontimeout;
|
||||||
} else {
|
} else {
|
||||||
// Default
|
// Default
|
||||||
serverinfo.logoutOnIdleSessionTimeout = true;
|
serverinfo.logoutonidlesessiontimeout = true;
|
||||||
}
|
}
|
||||||
if (user.siteadmin === SITERIGHT_ADMIN) {
|
if (user.siteadmin === SITERIGHT_ADMIN) {
|
||||||
if (parent.parent.config.settings.managealldevicegroups.indexOf(user._id) >= 0) { serverinfo.manageAllDeviceGroups = true; }
|
if (parent.parent.config.settings.managealldevicegroups.indexOf(user._id) >= 0) { serverinfo.manageAllDeviceGroups = true; }
|
||||||
|
2
public/scripts/amt-wsman-0.2.0-min.js
vendored
2
public/scripts/amt-wsman-0.2.0-min.js
vendored
File diff suppressed because one or more lines are too long
@ -39,6 +39,7 @@ var meshCentralSourceFiles = [
|
|||||||
"../views/messenger.handlebars",
|
"../views/messenger.handlebars",
|
||||||
"../views/player.handlebars",
|
"../views/player.handlebars",
|
||||||
"../views/sharing.handlebars",
|
"../views/sharing.handlebars",
|
||||||
|
"../views/sharing-mobile.handlebars",
|
||||||
"../views/mstsc.handlebars",
|
"../views/mstsc.handlebars",
|
||||||
"../views/ssh.handlebars",
|
"../views/ssh.handlebars",
|
||||||
"../emails/account-check.html",
|
"../emails/account-check.html",
|
||||||
|
20117
translate/translate.json
20117
translate/translate.json
File diff suppressed because it is too large
Load Diff
@ -1524,8 +1524,22 @@
|
|||||||
function setSessionActivity() { sessionActivity = Date.now(); }
|
function setSessionActivity() { sessionActivity = Date.now(); }
|
||||||
function checkIdleSessionTimeout() {
|
function checkIdleSessionTimeout() {
|
||||||
var delta = (Date.now() - sessionActivity);
|
var delta = (Date.now() - sessionActivity);
|
||||||
if (delta > serverinfo.timeout && serverinfo.logoutOnIdleSessionTimeout) {
|
if (delta > serverinfo.timeout) {
|
||||||
window.location.href = 'logout';
|
if (desktop != null) { // Disconnect remote desktop
|
||||||
|
desktop.Stop();
|
||||||
|
desktopNode = desktop = null;
|
||||||
|
}
|
||||||
|
if (terminal != null) { // Disconnect terminal
|
||||||
|
terminal.Stop();
|
||||||
|
terminal = null;
|
||||||
|
}
|
||||||
|
if (files != null) { // Disconnect files
|
||||||
|
files.Stop();
|
||||||
|
files = null;
|
||||||
|
}
|
||||||
|
if (serverinfo.logoutonidlesessiontimeout) {
|
||||||
|
window.location.href = 'logout';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2447,17 +2447,28 @@
|
|||||||
files.Stop();
|
files.Stop();
|
||||||
files = null;
|
files = null;
|
||||||
}
|
}
|
||||||
if (serverinfo.logoutOnIdleSessionTimeout) {
|
if (serverinfo.logoutonidlesessiontimeout) {
|
||||||
window.location.href = 'logout';
|
window.location.href = 'logout';
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
var ds = Math.round((serverinfo.timeout - delta) / 1000);
|
var ds = Math.round((serverinfo.timeout - delta) / 1000);
|
||||||
|
var sessionInProgress = desktop != null || terminal != null || files != null;
|
||||||
|
var show = serverinfo.logoutonidlesessiontimeout || sessionInProgress;
|
||||||
|
var isLogout = serverinfo.logoutonidlesessiontimeout;
|
||||||
|
var theText = ''; // Initialize theText
|
||||||
if (ds <= 60) {
|
if (ds <= 60) {
|
||||||
QH('idleTimeoutNotify', '<br />' + format((ds == 1)?"1 second until disconnect":"{0} seconds until disconnect", ds));
|
theText = isLogout
|
||||||
|
? (ds == 1 ? "1 second until logout" : "{0} seconds until logout")
|
||||||
|
: (ds == 1 ? "1 second until disconnect" : "{0} seconds until disconnect");
|
||||||
} else {
|
} else {
|
||||||
ds = Math.round(ds / 60);
|
ds = Math.round(ds / 60);
|
||||||
if (ds <= 5) { QH('idleTimeoutNotify', '<br />' + format((ds == 1)?"1 minute until disconnect":"{0} minutes until disconnect", ds)); }
|
if (ds <= 5) {
|
||||||
|
theText = isLogout
|
||||||
|
? (ds == 1 ? "1 minute until logout" : "{0} minutes until logout")
|
||||||
|
: (ds == 1 ? "1 minute until disconnect" : "{0} minutes until disconnect");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
QH('idleTimeoutNotify', show && theText ? '<br />' + format(theText, ds) : '');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -11356,7 +11367,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function p13openfilefolder() {
|
function p13openfilefolder() {
|
||||||
setDialogMode(2, "Open File/Folder", 3, p13openfilefolderEx, "Are you sure you want to open this file/folder on the remote devices desktop ?");
|
setDialogMode(2, "Open File/Folder", 3, p13openfilefolderEx, "Are you sure you want to open this file/folder on the remote devices desktop?");
|
||||||
}
|
}
|
||||||
function p13openfilefolderEx() {
|
function p13openfilefolderEx() {
|
||||||
var openfilefolder = "", checkboxes = document.getElementsByName('fd');
|
var openfilefolder = "", checkboxes = document.getElementsByName('fd');
|
||||||
|
@ -2897,17 +2897,28 @@
|
|||||||
files.Stop();
|
files.Stop();
|
||||||
files = null;
|
files = null;
|
||||||
}
|
}
|
||||||
if (serverinfo.logoutOnIdleSessionTimeout) {
|
if (serverinfo.logoutonidlesessiontimeout) {
|
||||||
window.location.href = 'logout';
|
window.location.href = 'logout';
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
var ds = Math.round((serverinfo.timeout - delta) / 1000);
|
var ds = Math.round((serverinfo.timeout - delta) / 1000);
|
||||||
|
var sessionInProgress = (desktop != null || terminal != null || files != null);
|
||||||
|
var show = serverinfo.logoutonidlesessiontimeout || sessionInProgress;
|
||||||
|
var isLogout = serverinfo.logoutonidlesessiontimeout;
|
||||||
|
var theText = '';
|
||||||
if (ds <= 60) {
|
if (ds <= 60) {
|
||||||
QH('idleTimeoutNotify', '<br />' + format((ds == 1) ? "1 second until disconnect" : "{0} seconds until disconnect", ds));
|
theText = isLogout
|
||||||
|
? (ds == 1 ? "1 second until logout" : "{0} seconds until logout")
|
||||||
|
: (ds == 1 ? "1 second until disconnect" : "{0} seconds until disconnect");
|
||||||
} else {
|
} else {
|
||||||
ds = Math.round(ds / 60);
|
ds = Math.round(ds / 60);
|
||||||
if (ds <= 5) { QH('idleTimeoutNotify', '<br />' + format((ds == 1) ? "1 minute until disconnect" : "{0} minutes until disconnect", ds)); }
|
if (ds <= 5) {
|
||||||
|
theText = isLogout
|
||||||
|
? (ds == 1 ? "1 minute until logout" : "{0} minutes until logout")
|
||||||
|
: (ds == 1 ? "1 minute until disconnect" : "{0} minutes until disconnect");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
QH('idleTimeoutNotify', show && theText ? '<br />' + format(theText, ds) : '');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -12150,7 +12161,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function p13openfilefolder() {
|
function p13openfilefolder() {
|
||||||
setModalContent('xxAddAgent', "Open File/Folder", 'Are you sure you want to open this file/folder on the remote devices desktop ?');
|
setModalContent('xxAddAgent', "Open File/Folder", "Are you sure you want to open this file/folder on the remote devices desktop?");
|
||||||
showModal('xxAddAgentModal', 'idx_dlgOkButton', () => p13openfilefolderEx());
|
showModal('xxAddAgentModal', 'idx_dlgOkButton', () => p13openfilefolderEx());
|
||||||
}
|
}
|
||||||
function p13openfilefolderEx() {
|
function p13openfilefolderEx() {
|
||||||
|
@ -822,8 +822,22 @@
|
|||||||
function setSessionActivity() { sessionActivity = Date.now(); }
|
function setSessionActivity() { sessionActivity = Date.now(); }
|
||||||
function checkIdleSessionTimeout() {
|
function checkIdleSessionTimeout() {
|
||||||
var delta = (Date.now() - sessionActivity);
|
var delta = (Date.now() - sessionActivity);
|
||||||
if (delta > serverinfo.timeout && serverinfo.logoutOnIdleSessionTimeout) {
|
if (delta > serverinfo.timeout) {
|
||||||
window.location.href = 'logout';
|
if (desktop != null) { // Disconnect remote desktop
|
||||||
|
desktop.Stop();
|
||||||
|
desktopNode = desktop = null;
|
||||||
|
}
|
||||||
|
if (terminal != null) { // Disconnect terminal
|
||||||
|
terminal.Stop();
|
||||||
|
terminal = null;
|
||||||
|
}
|
||||||
|
if (files != null) { // Disconnect files
|
||||||
|
files.Stop();
|
||||||
|
files = null;
|
||||||
|
}
|
||||||
|
if (serverinfo.logoutonidlesessiontimeout) {
|
||||||
|
window.location.href = 'logout';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user