summaryrefslogtreecommitdiffstats
path: root/browser/html/cool.html.m4
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2021-12-07 11:04:14 +0100
committerAndras Timar <andras.timar@collabora.com>2021-12-11 21:58:34 +0100
commitf3d2aa4be0f07d321982d82038ef72efae682313 (patch)
treee29675962f01ec821de2901453cd7b29f996d897 /browser/html/cool.html.m4
parentTry harder to get translation of keyboard shortcuts (diff)
downloadonline-f3d2aa4be0f07d321982d82038ef72efae682313.tar.gz
online-f3d2aa4be0f07d321982d82038ef72efae682313.zip
Use correct formatting for string variables
- when reading from config use correct type so SyntaxException is thrown when we type non-number into uint field - handle SyntaxException and send 500 so user will get response (previously we left request without response until timeout) - log about incorrect value in the config - simplify repeated bool -> string conversion after config read Signed-off-by: Szymon Kłos <szymon.klos@collabora.com> Change-Id: I1c50de263ffdb1d97eb9381754bc7cf3bd05dbfa
Diffstat (limited to 'browser/html/cool.html.m4')
-rw-r--r--browser/html/cool.html.m44
1 files changed, 2 insertions, 2 deletions
diff --git a/browser/html/cool.html.m4 b/browser/html/cool.html.m4
index 5a6c54989b..03ee093e18 100644
--- a/browser/html/cool.html.m4
+++ b/browser/html/cool.html.m4
@@ -214,7 +214,7 @@ m4_ifelse(MOBILEAPP,[true],
<!--%DOCUMENT_SIGNING_DIV%-->
<script>
- window.documentSigningURL = '%DOCUMENT_SIGNING_URL%';
+ window.documentSigningURL = decodeURIComponent('%DOCUMENT_SIGNING_URL%');
</script>
<input id="insertgraphic" aria-labelledby="menu-insertgraphic" type="file" accept="image/*" style="position: fixed; top: -100em">
@@ -315,7 +315,7 @@ m4_ifelse(MOBILEAPP,[true],
window.outOfFocusTimeoutSecs = %OUT_OF_FOCUS_TIMEOUT_SECS%;
window.idleTimeoutSecs = %IDLE_TIMEOUT_SECS%;
window.protocolDebug = %PROTOCOL_DEBUG%;
- window.frameAncestors = '%FRAME_ANCESTORS%';
+ window.frameAncestors = decodeURIComponent('%FRAME_ANCESTORS%');
window.socketProxy = %SOCKET_PROXY%;
window.tileSize = 256;
window.uiDefaults = %UI_DEFAULTS%;])