From 2c01ac4b75c62317b2ad36e05330b79fcc0118f5 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Mon, 7 Sep 2020 11:27:18 +0800 Subject: [PATCH 1/3] Improve handling of empty iframe src "about:blank" is suggested in https://developer.mozilla.org/en-US/docs/Web/HTML/Element/iframe --- src/webui/www/private/download.html | 2 +- src/webui/www/private/upload.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/webui/www/private/download.html b/src/webui/www/private/download.html index bf5b16708..3a625d65f 100644 --- a/src/webui/www/private/download.html +++ b/src/webui/www/private/download.html @@ -13,7 +13,7 @@ - +

diff --git a/src/webui/www/private/upload.html b/src/webui/www/private/upload.html index ab4edd1f6..28f98d84e 100644 --- a/src/webui/www/private/upload.html +++ b/src/webui/www/private/upload.html @@ -11,7 +11,7 @@ - +
From 2f1016494b017503556ca5b4d50c1421347e9575 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Mon, 7 Sep 2020 11:41:03 +0800 Subject: [PATCH 2/3] Specify UTF-8 charset when forming data from plain text This suppresses a browser warning about unspecified character encoding of an HTTP response. --- src/base/http/types.h | 2 +- src/webui/api/torrentscontroller.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/base/http/types.h b/src/base/http/types.h index 0c1cb2f14..ff4d8e0a3 100644 --- a/src/base/http/types.h +++ b/src/base/http/types.h @@ -63,7 +63,7 @@ namespace Http const char CONTENT_TYPE_HTML[] = "text/html"; const char CONTENT_TYPE_CSS[] = "text/css"; - const char CONTENT_TYPE_TXT[] = "text/plain"; + const char CONTENT_TYPE_TXT[] = "text/plain; charset=UTF-8"; const char CONTENT_TYPE_JS[] = "application/javascript"; const char CONTENT_TYPE_JSON[] = "application/json"; const char CONTENT_TYPE_GIF[] = "image/gif"; diff --git a/src/webui/api/torrentscontroller.cpp b/src/webui/api/torrentscontroller.cpp index ab163afbc..d969428b1 100644 --- a/src/webui/api/torrentscontroller.cpp +++ b/src/webui/api/torrentscontroller.cpp @@ -601,9 +601,9 @@ void TorrentsController::addAction() } if (partialSuccess) - setResult("Ok."); + setResult(QLatin1String("Ok.")); else - setResult("Fails."); + setResult(QLatin1String("Fails.")); } void TorrentsController::addTrackersAction() From 5677ce1cc970a84bc5ae6ce9d8f8ca87546a2883 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Mon, 7 Sep 2020 12:08:23 +0800 Subject: [PATCH 3/3] Use proper uppercase "UTF-8" in charset field --- src/gui/gpl.html | 2 +- src/gui/thanks.html | 2 +- src/gui/translators.html | 2 +- src/webui/www/private/scripts/mocha-init.js | 2 +- src/webui/www/public/scripts/login.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gui/gpl.html b/src/gui/gpl.html index cec3fa8b9..0a01a4bda 100644 --- a/src/gui/gpl.html +++ b/src/gui/gpl.html @@ -1,7 +1,7 @@ - + License diff --git a/src/gui/thanks.html b/src/gui/thanks.html index 6a3b9fb31..a0de13829 100644 --- a/src/gui/thanks.html +++ b/src/gui/thanks.html @@ -1,7 +1,7 @@ - + Thanks diff --git a/src/gui/translators.html b/src/gui/translators.html index 10831ac1c..a8384544c 100644 --- a/src/gui/translators.html +++ b/src/gui/translators.html @@ -1,7 +1,7 @@ - + Translators diff --git a/src/webui/www/private/scripts/mocha-init.js b/src/webui/www/private/scripts/mocha-init.js index d59c119c5..ff92c69db 100644 --- a/src/webui/www/private/scripts/mocha-init.js +++ b/src/webui/www/private/scripts/mocha-init.js @@ -1025,7 +1025,7 @@ const initializeWindows = function() { new Request({ url: 'api/v2/app/shutdown', onSuccess: function() { - document.write(' QBT_TR(qBittorrent has been shutdown)QBT_TR[CONTEXT=HttpServer]

QBT_TR(qBittorrent has been shutdown)QBT_TR[CONTEXT=HttpServer]

'); + document.write(' QBT_TR(qBittorrent has been shutdown)QBT_TR[CONTEXT=HttpServer]

QBT_TR(qBittorrent has been shutdown)QBT_TR[CONTEXT=HttpServer]

'); document.close(); stop(); } diff --git a/src/webui/www/public/scripts/login.js b/src/webui/www/public/scripts/login.js index 00cffccda..175e0012c 100644 --- a/src/webui/www/public/scripts/login.js +++ b/src/webui/www/public/scripts/login.js @@ -42,7 +42,7 @@ function submitLoginForm() { const xhr = new XMLHttpRequest(); xhr.open('POST', 'api/v2/auth/login', true); - xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded; charset=utf-8'); + xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded; charset=UTF-8'); xhr.addEventListener('readystatechange', function() { if (xhr.readyState === 4) { // DONE state if ((xhr.status === 200) && (xhr.responseText === "Ok."))