daxi20/smartdns
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci: fix redirect error message issue

Browse Source
This commit is contained in:
Nick Peng
2022-09-15 23:17:58 +08:00
parent 1991a0b102
commit 33ead3afbd
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
package/luci/files/root/www/luci-static/resources/view/smartdns/smartdns.js
View File

@@ -57,7 +57,6 @@ function smartdnsRenderStatus(res) {
var autoSetDnsmasq = uci.get_first('smartdns', 'smartdns', 'auto_set_dnsmasq'); var autoSetDnsmasq = uci.get_first('smartdns', 'smartdns', 'auto_set_dnsmasq');
var smartdnsPort = uci.get_first('smartdns', 'smartdns', 'port'); var smartdnsPort = uci.get_first('smartdns', 'smartdns', 'port');
var dnsmasqServer = uci.get_first('dhcp', 'dnsmasq', 'server'); var dnsmasqServer = uci.get_first('dhcp', 'dnsmasq', 'server');
uci.unload('dhcp');
if (isRunning) { if (isRunning) {
renderHTML += "<span style=\"color:green;font-weight:bold\">SmartDNS - " + _("RUNNING") + "</span>"; renderHTML += "<span style=\"color:green;font-weight:bold\">SmartDNS - " + _("RUNNING") + "</span>";
@@ -68,9 +67,10 @@ function smartdnsRenderStatus(res) {
if (autoSetDnsmasq === '1' && smartdnsPort != '53') { if (autoSetDnsmasq === '1' && smartdnsPort != '53') {
var matchLine = "127.0.0.1#" + smartdnsPort; var matchLine = "127.0.0.1#" + smartdnsPort;
var dnsmasqServer = uci.get_first('dhcp', 'dnsmasq', 'server') || "";
if (dnsmasqServer.indexOf(matchLine) < 0) { uci.unload('dhcp');
uci.load('dhcp');
if (dnsmasqServer == undefined || dnsmasqServer.indexOf(matchLine) < 0) {
renderHTML += "<br /><span style=\"color:red;font-weight:bold\">" + _("Dnsmasq Forwared To Smartdns Failure") + "</span>"; renderHTML += "<br /><span style=\"color:red;font-weight:bold\">" + _("Dnsmasq Forwared To Smartdns Failure") + "</span>";
} }
} }
@@ -106,8 +106,7 @@ return view.extend({
view.innerHTML = smartdnsRenderStatus(res); view.innerHTML = smartdnsRenderStatus(res);
}); });
} }
poll.add(renderStatus); poll.add(renderStatus, 1);
setTimeout(renderStatus, 1000);
return E('div', { class: 'cbi-map' }, return E('div', { class: 'cbi-map' },
E('div', { class: 'cbi-section' }, [ E('div', { class: 'cbi-section' }, [