fergalmoran/DnsServer
1
0
Fork 0
mirror of https://github.com/fergalmoran/DnsServer.git synced 2026-02-23 08:14:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

webapp: fixed bug in checkForWebConsoleRedirection() causing redirection when using default ports.

Browse Source
This commit is contained in:
Shreyas Zare
2021-03-21 17:14:50 +05:30
parent 6c1ce550fd
commit e227eeffab
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
DnsServerCore/www/js/main.js
View File

@@ -1037,20 +1037,22 @@ function saveDnsSettings() {
}
function checkForWebConsoleRedirection(responseJSON) {
var hostname = window.location.hostname;
if (location.protocol == "https:") {
var currentPort = window.location.port;
var webServiceLocalAddresses = responseJSON.response.webServiceLocalAddresses;
if (webServiceLocalAddresses != null) {
for (var i = 0; i < webServiceLocalAddresses.length; i++) {
if ((webServiceLocalAddresses[i] === "0.0.0.0") || (webServiceLocalAddresses[i] === "[::]") || (webServiceLocalAddresses[i] === window.location.hostname))
break;
if ((currentPort == 0) || (currentPort == ""))
currentPort = 443;
hostname = webServiceLocalAddresses[i];
}
}
if (currentPort != responseJSON.response.webServiceTlsPort)
window.open("https://" + window.location.hostname + ":" + responseJSON.response.webServiceTlsPort, "_self");
} else {
var currentPort = window.location.port;
if ((window.location.hostname != hostname) || ((window.location.port != responseJSON.response.webServiceHttpPort) && (window.location.port != responseJSON.response.webServiceTlsPort))) {
window.open("http://" + hostname + ":" + responseJSON.response.webServiceHttpPort, "_self");
if ((currentPort == 0) || (currentPort == ""))
currentPort = 80;
if (currentPort != responseJSON.response.webServiceHttpPort)
window.open("http://" + window.location.hostname + ":" + responseJSON.response.webServiceHttpPort, "_self");
}
}