diff --git a/agents/MeshCentralRouter.exe b/agents/MeshCentralRouter.exe index b0cb1cc0..08c47282 100644 Binary files a/agents/MeshCentralRouter.exe and b/agents/MeshCentralRouter.exe differ diff --git a/meshuser.js b/meshuser.js index 2d6a63eb..6e3bb463 100644 --- a/meshuser.js +++ b/meshuser.js @@ -290,8 +290,10 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use } case 'logincookie': { - // Return a login cookie - try { ws.send(JSON.stringify({ action: 'logincookie', cookie: parent.parent.encodeCookie({ u: user._id, a: 3 }, parent.parent.loginCookieEncryptionKey) })); } catch (ex) { } + // If allowed, return a login cookie + if (parent.parent.config.settings.allowlogintoken === true) { + try { ws.send(JSON.stringify({ action: 'logincookie', cookie: parent.parent.encodeCookie({ u: user._id, a: 3 }, parent.parent.loginCookieEncryptionKey) })); } catch (ex) { } + } break; } case 'servertimelinestats': diff --git a/package.json b/package.json index c6f51d7a..dfb63e7c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "0.3.3-c", + "version": "0.3.3-d", "keywords": [ "Remote Management", "Intel AMT", diff --git a/views/default-min.handlebars b/views/default-min.handlebars index d5178c08..e9302ee2 100644 --- a/views/default-min.handlebars +++ b/views/default-min.handlebars @@ -1 +1 @@ - {{{title}}}
{{{title}}}
{{{title2}}}

{{{logoutControl}}}

♦
 

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

{{{logoutControl}}}

♦
 

\ No newline at end of file diff --git a/views/default.handlebars b/views/default.handlebars index 2c4e39b7..2dbb95e8 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -4566,7 +4566,7 @@ fullscreen = !fullscreen; if (fullscreen) { QC('body').add("fulldesk"); - QS('deskarea3x').height = null; + //QS('deskarea3x').height = null; // If shift is pressed, enter browser full screen. if (e.shiftKey == true) { enterBrowserFullscreen(Q('deskarea0')); browserfullscreen = true; } } else { @@ -4591,9 +4591,10 @@ if (deskAspectRatio == 2) { // Scale mode - QS('Desk').width = '100%'; + QS('Desk')['margin-top'] = null; QS('Desk').height = '100%'; - QS('deskarea3x').height = null; + QS('Desk').width = '100%'; + //QS('deskarea3x').height = null; QS('DeskParent').overflow = 'hidden'; } else if (deskAspectRatio == 1) { // Zoomed mode @@ -4603,18 +4604,18 @@ QS('DeskParent').overflow = 'scroll'; } else { // Fixed aspect ratio - if (parentH / parentW > deskH / deskW) { - var hNew = (deskH * parentW / deskW) + 'px'; - if (webPageFullScreen || fullscreen) { - QS('deskarea3x').height = null; - } else { + if ((parentH / parentW) > (deskH / deskW)) { + var hNew = ((deskH * parentW) / deskW) + 'px'; + //if (webPageFullScreen || fullscreen) { + //QS('deskarea3x').height = null; + //} else { // QS('deskarea3x').height = hNew; - QS('deskarea3x').height = null; - } + //QS('deskarea3x').height = null; + //} QS('Desk').height = hNew; QS('Desk').width = '100%'; } else { - var wNew = (deskW * parentH / deskH) + 'px'; + var wNew = ((deskW * parentH) / deskH) + 'px'; if (webPageFullScreen || fullscreen) { QS('Desk').height = null; } else { @@ -4622,6 +4623,7 @@ } QS('Desk').width = wNew; } + QS('Desk')['margin-top'] = null; QS('DeskParent').overflow = 'hidden'; } }