Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-app-aria2: fix showRPCURL when using https

Browse source 
if login luci-admin with https, RPC protocol should be https or wss.

Signed-off-by: Zheng Qian <sotux82@gmail.com>
This commit is contained in:
Zheng Qian 2018-12-14 13:32:18 +08:00
parent 76f81c262c
commit 83703aaec0
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-app-aria2/Makefile
View file

@ -14,7 +14,7 @@ PKG_VERSION:=1.0.1
# Release == build # Release == build
# increase on changes of translation files # increase on changes of translation files
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0
PKG_MAINTAINER:=Hsing-Wang Liao <kuoruan@gmail.com> PKG_MAINTAINER:=Hsing-Wang Liao <kuoruan@gmail.com>

11
applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm
View file

@ -45,11 +45,14 @@ function showRPCURL() {
var auth_method = document.getElementById("cbid.aria2.main.rpc_auth_method"); var auth_method = document.getElementById("cbid.aria2.main.rpc_auth_method");
var auth_port = document.getElementById("cbid.aria2.main.rpc_listen_port"); var auth_port = document.getElementById("cbid.aria2.main.rpc_listen_port");
var auth_port_value; var auth_port_value;
if (window.location.protocol == "https:") {
protocol += "s";
}
if (auth_port.value == "") { if (auth_port.value == "") {
auth_port_value = "6800" auth_port_value = "6800";
} else { } else {
auth_port_value = auth_port.value auth_port_value = auth_port.value;
}; }
if (auth_method.value == "token") { if (auth_method.value == "token") {
var auth_token = document.getElementById("cbid.aria2.main.rpc_secret"); var auth_token = document.getElementById("cbid.aria2.main.rpc_secret");
newTextNode.value = protocol + "://token:" + auth_token.value + "@" + document.domain + ":" + auth_port_value + "/jsonrpc"; newTextNode.value = protocol + "://token:" + auth_token.value + "@" + document.domain + ":" + auth_port_value + "/jsonrpc";
@ -68,7 +71,7 @@ function openWebUI(path) {
var pos = curWwwPath.indexOf(pathName); var pos = curWwwPath.indexOf(pathName);
var localhostPath = curWwwPath.substring(0, pos); var localhostPath = curWwwPath.substring(0, pos);
var url = localhostPath + "/" + path; var url = localhostPath + "/" + path;
window.open(url) window.open(url);
}; };
//]]> //]]>
</script> </script>