From 6f092af22e9177fed1e4270d2bd96fd053299c33 Mon Sep 17 00:00:00 2001 From: Luiz Costa Date: Tue, 4 Jun 2024 16:44:50 +0100 Subject: [PATCH] add resolution parameter --- msp_remoteadmin/public/js/msp_remote.js | 5 +++-- msp_remoteadmin/tools.py | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/msp_remoteadmin/public/js/msp_remote.js b/msp_remoteadmin/public/js/msp_remote.js index 1258019..b74d366 100644 --- a/msp_remoteadmin/public/js/msp_remote.js +++ b/msp_remoteadmin/public/js/msp_remote.js @@ -22,8 +22,9 @@ function connect_remote(frm, type) { }, callback: function (r) { if (r.message) { - var url = r.message; - window.open(url, 'GuacamoleConsole', 'width=1024,height=768'); + var url = r.message.url; + resolution = r.message.resolution.split('x'); + window.open(url, 'GuacamoleConsole', 'width=' + resolution[0] + ',height=' + resolution[1]); } } }) diff --git a/msp_remoteadmin/tools.py b/msp_remoteadmin/tools.py index 742c381..f72b432 100644 --- a/msp_remoteadmin/tools.py +++ b/msp_remoteadmin/tools.py @@ -49,7 +49,7 @@ def create_session(name, protocol): params.append(f"password={password}") if domain: params.append(f"domain={domain}") - if guaca_config.keyboard_layout: + if guaca_config.get('keyboard_layout'): params.append(f"server-layout={guaca_config.keyboard_layout}") if params: uri = f"{uri}/?ignore-cert=true&disable-audio=true&{'&'.join(params)}" @@ -62,4 +62,4 @@ def create_session(name, protocol): if params: uri = f"{uri}/?{'&'.join(params)}" url = f'{guaca_config.guacamole_server}/?#/?token={token}&quickconnect={urllib.parse.quote(uri)}' - return url + return { 'url': url, 'resolution': guaca_config.resolution if guaca_config.get('resolution') else '800x600'}