diff options
75 files changed, 739 insertions, 228 deletions
diff --git a/applications/luci-app-commands/luasrc/view/commands.htm b/applications/luci-app-commands/luasrc/view/commands.htm index 3b361558e..4285f25cb 100644 --- a/applications/luci-app-commands/luasrc/view/commands.htm +++ b/applications/luci-app-commands/luasrc/view/commands.htm @@ -108,9 +108,7 @@ if (legend && output) { - var prefix = location.protocol + '//' + location.hostname + - (location.port ? ':' + location.port : '') + - location.pathname.split(';')[0] + 'command/'; + var prefix = location.protocol + '//' + location.host + '<%=url('command')%>/'; var suffix = (args ? '/' + args : ''); var link = prefix + id + suffix; diff --git a/applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua b/applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua index 755350457..a42c1499f 100644 --- a/applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua +++ b/applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua @@ -68,12 +68,6 @@ function name.write(self, section, value) out.exclude = value inp.exclude = value end - - m.redirect = ds.build_url("admin/network/firewall/zones", value) - m.title = "%s - %s" %{ - translate("Firewall - Zone Settings"), - translatef("Zone %q", value or "?") - } end p = { diff --git a/applications/luci-app-mwan3/luasrc/controller/mwan3.lua b/applications/luci-app-mwan3/luasrc/controller/mwan3.lua index d5fc4a3ed..18c2135e4 100644 --- a/applications/luci-app-mwan3/luasrc/controller/mwan3.lua +++ b/applications/luci-app-mwan3/luasrc/controller/mwan3.lua @@ -97,9 +97,9 @@ function diagnosticsData(interface, task) return interfaceNumber end - function diag_command(cmd, addr) + function diag_command(cmd, device, addr) if addr and addr:match("^[a-zA-Z0-9%-%.:_]+$") then - local util = io.popen(cmd % ut.shellquote(addr)) + local util = io.popen(cmd %{ut.shellquote(device), ut.shellquote(addr)}) if util then while true do local ln = util:read("*l") @@ -114,8 +114,14 @@ function diagnosticsData(interface, task) end function get_gateway(inteface) - local dump = require("luci.util").ubus("network.interface.%s" % interface, "status", {}) - local gateway + local gateway = nil + local dump = nil + + dump = require("luci.util").ubus("network.interface.%s_4" % interface, "status", {}) + if not dump then + dump = require("luci.util").ubus("network.interface.%s" % interface, "status", {}) + end + if dump and dump.route then local _, route for _, route in ipairs(dump.route) do @@ -139,7 +145,7 @@ function diagnosticsData(interface, task) if task == "ping_gateway" then local gateway = get_gateway(interface) if gateway ~= nil then - diag_command("ping -c 5 -W 1 %s 2>&1", gateway) + diag_command("ping -I %s -c 5 -W 1 %s 2>&1", device, gateway) else luci.http.prepare_content("text/plain") luci.http.write(string.format("No gateway for interface %s found.", interface)) @@ -148,7 +154,7 @@ function diagnosticsData(interface, task) local trackips = uci:get("mwan3", interface, "track_ip") if #trackips > 0 then for i in pairs(trackips) do - diag_command("ping -c 5 -W 1 %s 2>&1", trackips[i]) + diag_command("ping -I %s -c 5 -W 1 %s 2>&1", device, trackips[i]) end else luci.http.write(string.format("No tracking Hosts for interface %s defined.", interface)) diff --git a/applications/luci-app-openvpn/Makefile b/applications/luci-app-openvpn/Makefile index a8070fd3f..380ee73a6 100644 --- a/applications/luci-app-openvpn/Makefile +++ b/applications/luci-app-openvpn/Makefile @@ -9,6 +9,8 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI Support for OpenVPN LUCI_DEPENDS:= +PKG_LICENSE:=Apache-2.0 + include ../../luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/applications/luci-app-pagekitec/po/ja/pagekitec.po b/applications/luci-app-pagekitec/po/ja/pagekitec.po new file mode 100644 index 000000000..c303f5828 --- /dev/null +++ b/applications/luci-app-pagekitec/po/ja/pagekitec.po @@ -0,0 +1,59 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: \n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.0.7\n" +"Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"Language: ja\n" + +msgid "" +"<p/>Note: you need a working PageKite account, or at least, your own running " +"front end for this form to work. Visit <a href=\"https://pagekite.net/home/" +"\">your account</a> to set up a name for your router and get a secret key " +"for the connection. <p/><em>Note: this web configurator only supports some " +"very very basic uses of pagekite.</em>" +msgstr "" +"<p/>注意: 動作には PageKite アカウント、もしくは少なくともこのフォーム用の実" +"行中のフロントエンドが必要です。ルーター用の名前をセットアップするには<a " +"href=\"https://pagekite.net/home/\">アカウント</a>へアクセスし、接続用のシー" +"クレット キーを取得します。<p/><em>注意: この Web 設定は、PageKite の非常に簡" +"易な使用のみサポートしています。</em>" + +msgid "Basic HTTP" +msgstr "ベーシック HTTP" + +msgid "Basic SSH" +msgstr "ベーシック SSH" + +msgid "" +"Enable a tunnel to the local HTTP server (in most cases, this admin site)" +msgstr "ローカル HTTP サーバーへのトンネルを有効化（通常、この管理サイト）" + +msgid "Enable a tunnel to the local SSH server" +msgstr "ローカル SSH サーバーへのトンネルを有効化" + +msgid "Kite Name" +msgstr "Kite 名" + +msgid "Kite Secret" +msgstr "Kite シークレット" + +msgid "PageKite" +msgstr "PageKite" + +msgid "Static Setup" +msgstr "静的セットアップ" + +msgid "" +"Static setup, disable FE failover and DDNS updates, set this if you are " +"running your own frontend without a pagekite.me account" +msgstr "" +"静的セットアップは、 FE フェイルオーバーと DDNS アップデートを無効にします。" +"もし pagekite.me アカウント無しにフロントエンドを実行している場合、これを設定" +"します。" diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua index 7b6b9658c..a1dcbc638 100644 --- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua +++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua @@ -18,8 +18,11 @@ m = Map("travelmate", translate("Travelmate"), .. translatef("For further information " .. "<a href=\"%s\" target=\"_blank\">" .. "see online documentation</a>", "https://github.com/openwrt/packages/blob/master/net/travelmate/files/README.md")) +m:chain("network") +m:chain("firewall") +m.apply_on_parse = true -function m.on_after_commit(self) +function m.on_apply(self) luci.sys.call("env -i /etc/init.d/travelmate restart >/dev/null 2>&1") luci.http.redirect(luci.dispatcher.build_url("admin", "services", "travelmate")) end @@ -28,39 +31,27 @@ end if uplink == "" then ds = m:section(NamedSection, "global", "travelmate", translate("Interface Wizard")) - - o = ds:option(Value, "", translate("Uplink interface")) + o = ds:option(Value, "trm_iface", translate("Create Uplink interface"), + translate("Create a new wireless wan uplink interface, configure it to use dhcp and ") + .. translate("add it to the wan zone of the firewall.<br />") + .. translate("This step has only to be done once.")) o.datatype = "and(uciname,rangelength(3,15))" o.default = trmiface o.rmempty = false - btn = ds:option(Button, "trm_iface", translate("Create Uplink Interface"), - translate("Create a new wireless wan uplink interface, configure it to use dhcp and ") - .. translate("add it to the wan zone of the firewall. This step has only to be done once.")) - btn.inputtitle = translate("Add Interface") - btn.inputstyle = "apply" - btn.disabled = false - - function btn.write(self, section) - local iface = o:formvalue(section) - if iface then - uci:set("travelmate", section, "trm_iface", iface) - uci:save("travelmate") - uci:commit("travelmate") - local net = nw:add_network(iface, { proto = "dhcp" }) - if net then - nw:save("network") - nw:commit("network") - local zone = fw:get_zone_by_network("wan") - if zone then - zone:add_network(iface) - fw:save("firewall") - fw:commit("firewall") - end + function o.validate(self, value) + if value then + local nwnet = nw:get_network(value) + local zone = fw:get_zone("wan") + local fwnet = fw:get_zone_by_network(value) + if not nwnet then + nwnet = nw:add_network(value, { proto = "dhcp" }) + end + if zone and not fwnet then + fwnet = zone:add_network(value) end - luci.sys.call("env -i /bin/ubus call network reload >/dev/null 2>&1") end - luci.http.redirect(luci.dispatcher.build_url("admin", "services", "travelmate")) + return value end return m end diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm index 1dacb6e24..f76b52e9c 100644 --- a/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm +++ b/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm @@ -46,8 +46,8 @@ This is free software, licensed under the Apache License, Version 2.0 <td style="<%=style%>"><%=bssid%></td> <td style="<%=style%>"><%=encryption%></td> <td class="cbi-value-field" style="width:80px"> - <input class="cbi-button cbi-button-up" type="button" value="" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>;dir=up'" alt="<%:Move up%>" title="<%:Move up%>"/> - <input class="cbi-button cbi-button-down" type="button" value="" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>;dir=down'" alt="<%:Move down%>" title="<%:Move down%>"/> + <input class="cbi-button cbi-button-up" type="button" value="" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>&dir=up'" alt="<%:Move up%>" title="<%:Move up%>"/> + <input class="cbi-button cbi-button-down" type="button" value="" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>&dir=down'" alt="<%:Move down%>" title="<%:Move down%>"/> </td> <td class="cbi-value-field" style="width:150px"> <input type="button" class="cbi-button cbi-button-edit" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiedit')%>?cfg=<%=section%>'" title="<%:Edit this Uplink%>" value="<%:Edit%>"/> diff --git a/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua b/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua index c92e37995..bf2b65a0a 100644 --- a/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua +++ b/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua @@ -29,53 +29,52 @@ s1:tab("basic", translate("Basic"), "https://www.unbound.net/", "https://github.com/openwrt/packages/blob/master/net/unbound/files/README.md")) -ena = s1:taboption("basic", Flag, "enabled", translate("Enable Unbound:"), - translate("Enable the initialization scripts for Unbound")) -ena.rmempty = false - -mcf = s1:taboption("basic", Flag, "manual_conf", translate("Manual Conf:"), - translate("Skip UCI and use /etc/unbound/unbound.conf")) -mcf.rmempty = false - -lci = s1:taboption("basic", Flag, "extended_luci", translate("Extended Tabs:"), - translate("See detailed tabs for statistics, debug, and manual configuration")) -lci.rmempty = false - - -function ena.cfgvalue(self, section) - return luci.sys.init.enabled("unbound") and self.enabled or self.disabled -end - - -function ena.write(self, section, value) - if value == "1" then - luci.sys.init.enable("unbound") - luci.sys.call("/etc/init.d/unbound start >/dev/null") - else - luci.sys.call("/etc/init.d/unbound stop >/dev/null") - luci.sys.init.disable("unbound") - end - - return Flag.write(self, section, value) -end - if valman ~= "1" then -- Not in manual configuration mode; show UCI s1:tab("advanced", translate("Advanced"), translatef("<h3>Unbound Advanced Settings</h3>\n" - .. "Link DHCP-DNS, Manipulate DNS, or protect your local domain in " + .. "Domain manipulation, lookup protection, and workarounds for " .. "<a href=\"%s\" target=\"_blank\">Unbound </a>" .. " DNS resolver.", "https://www.unbound.net/")) + s1:tab("DHCP", translate("DHCP"), + translatef("<h3>Unbound DHCP Settings</h3>\n" + .. "Link your DHCP server to " + .. "<a href=\"%s\" target=\"_blank\">Unbound </a>" + .. " DNS resolver.", "https://www.unbound.net/ ")) s1:tab("resource", translate("Resource"), translatef("<h3>Unbound Resource Settings</h3>\n" .. "Memory and protocol setttings for " .. "<a href=\"%s\" target=\"_blank\">Unbound </a>" .. " DNS resolver.", "https://www.unbound.net/")) +end +s1:tab("trigger", translate("Trigger"), + translatef("<h3>Unbound Event Trigger Settings</h3>\n" + .. "Start, reload, and save RFC5011 DNSKEY records for " + .. "<a href=\"%s\" target=\"_blank\">Unbound </a>" + .. " DNS resolver.", "https://www.unbound.net/")) + + +--Basic Tab, unconditional pieces +ena = s1:taboption("basic", Flag, "enabled", translate("Enable Unbound:"), + translate("Enable the initialization scripts for Unbound")) +ena.rmempty = false + +mcf = s1:taboption("basic", Flag, "manual_conf", translate("Manual Conf:"), + translate("Skip UCI and use /etc/unbound/unbound.conf")) +mcf.rmempty = false + +lci = s1:taboption("basic", Flag, "extended_luci", translate("Extended Tabs:"), + translate("See detailed tabs for statistics, debug, and manual configuration")) +lci.rmempty = false + + +if valman ~= "1" then + -- Not in manual configuration mode; show UCI --Basic Tab lsv = s1:taboption("basic", Flag, "localservice", translate("Local Service:"), translate("Accept queries only from local subnets")) @@ -90,11 +89,6 @@ if valman ~= "1" then nvd.rmempty = false nvd:depends({ validator = true }) - din = s1:taboption("basic", DynamicList, "domain_insecure", - translate("Domain Insecure:"), - translate("List domains to bypass checks of DNSSEC")) - din:depends({ validator = true }) - d64 = s1:taboption("basic", Flag, "dns64", translate("Enable DNS64:"), translate("Enable the DNS64 module")) d64.rmempty = false @@ -121,25 +115,56 @@ if valman ~= "1" then prt.rmempty = false --Avanced Tab - dlk = s1:taboption("advanced", ListValue, "dhcp_link", translate("DHCP Link:"), + din = s1:taboption("advanced", DynamicList, "domain_insecure", + translate("Domain Insecure:"), + translate("List domains to bypass checks of DNSSEC")) + din:depends({ validator = true }) + + dfw = s1:taboption("advanced", DynamicList, "domain_forward", + translate("Domain Forward:"), + translate("List domains to simply forward to stub resolvers in /tmp/resolve.auto")) + + rlh = s1:taboption("advanced", Flag, "rebind_localhost", translate("Filter Localhost Rebind:"), + translate("Protect against upstream response of 127.0.0.0/8")) + rlh.rmempty = false + + rpv = s1:taboption("advanced", ListValue, "rebind_protection", translate("Filter Private Rebind:"), + translate("Protect against upstream responses within local subnets")) + rpv:value("0", translate("No Filter")) + rpv:value("1", translate("Filter RFC1918/4193")) + rpv:value("2", translate("Filter Entire Subnet")) + rpv.rmempty = false + + rpn = s1:taboption("advanced", Value, "rebind_interface", translate("Rebind Network Filter:"), + translate("Network subnets to filter from upstream responses")) + rpn.template = "cbi/network_netlist" + rpn.widget = "checkbox" + rpn.rmempty = true + rpn.cast = "string" + rpn.nocreate = true + rpn:depends({ rebind_protection = 2 }) + rpn:depends({ rebind_protection = 3 }) + + --DHCP Tab + dlk = s1:taboption("DHCP", ListValue, "dhcp_link", translate("DHCP Link:"), translate("Link to supported programs to load DHCP into DNS")) dlk:value("none", translate("No Link")) dlk:value("dnsmasq", "dnsmasq") dlk:value("odhcpd", "odhcpd") dlk.rmempty = false - dp6 = s1:taboption("advanced", Flag, "dhcp4_slaac6", translate("DHCPv4 to SLAAC:"), + dp6 = s1:taboption("DHCP", Flag, "dhcp4_slaac6", translate("DHCPv4 to SLAAC:"), translate("Use DHCPv4 MAC to discover IP6 hosts SLAAC (EUI64)")) dp6.rmempty = false dp6:depends({ dhcp_link = "odhcpd" }) - dom = s1:taboption("advanced", Value, "domain", translate("Local Domain:"), + dom = s1:taboption("DHCP", Value, "domain", translate("Local Domain:"), translate("Domain suffix for this router and DHCP clients")) dom.placeholder = "lan" dom:depends({ dhcp_link = "none" }) dom:depends({ dhcp_link = "odhcpd" }) - dty = s1:taboption("advanced", ListValue, "domain_type", translate("Local Domain Type:"), + dty = s1:taboption("DHCP", ListValue, "domain_type", translate("Local Domain Type:"), translate("How to treat queries of this local domain")) dty:value("deny", translate("Ignored")) dty:value("refuse", translate("Refused")) @@ -148,7 +173,7 @@ if valman ~= "1" then dty:depends({ dhcp_link = "none" }) dty:depends({ dhcp_link = "odhcpd" }) - lfq = s1:taboption("advanced", ListValue, "add_local_fqdn", translate("LAN DNS:"), + lfq = s1:taboption("DHCP", ListValue, "add_local_fqdn", translate("LAN DNS:"), translate("How to enter the LAN or local network router in DNS")) lfq:value("0", translate("No Entry")) lfq:value("1", translate("Hostname, Primary Address")) @@ -158,7 +183,7 @@ if valman ~= "1" then lfq:depends({ dhcp_link = "none" }) lfq:depends({ dhcp_link = "odhcpd" }) - wfq = s1:taboption("advanced", ListValue, "add_wan_fqdn", translate("WAN DNS:"), + wfq = s1:taboption("DHCP", ListValue, "add_wan_fqdn", translate("WAN DNS:"), translate("Override the WAN side router entry in DNS")) wfq:value("0", translate("Use Upstream")) wfq:value("1", translate("Hostname, Primary Address")) @@ -168,7 +193,7 @@ if valman ~= "1" then wfq:depends({ dhcp_link = "none" }) wfq:depends({ dhcp_link = "odhcpd" }) - exa = s1:taboption("advanced", ListValue, "add_extra_dns", translate("Extra DNS:"), + exa = s1:taboption("DHCP", ListValue, "add_extra_dns", translate("Extra DNS:"), translate("Use extra DNS entries found in /etc/config/dhcp")) exa:value("0", translate("Ignore")) exa:value("1", translate("Include Network/Hostnames")) @@ -177,29 +202,6 @@ if valman ~= "1" then exa:depends({ dhcp_link = "none" }) exa:depends({ dhcp_link = "odhcpd" }) - dfw = s1:taboption("advanced", DynamicList, "domain_forward", - translate("Domain Forward:"), - translate("List domains to simply forward to stub resolvers in /tmp/resolve.auto")) - - rlh = s1:taboption("advanced", Flag, "rebind_localhost", translate("Filter Localhost Rebind:"), - translate("Protect against upstream response of 127.0.0.0/8")) - rlh.rmempty = false - - rpv = s1:taboption("advanced", ListValue, "rebind_protection", translate("Filter Private Rebind:"), - translate("Protect against upstream responses within local subnets")) - rpv:value("0", translate("No Filter")) - rpv:value("1", translate("Filter RFC1918/4193")) - rpv:value("2", translate("Filter Entire Subnet")) - rpv.rmempty = false - - rpn = s1:taboption("advanced", Value, "rebind_interface", translate("Rebind Network Filter:"), - translate("Network subnets to filter from upstream responses")) - rpn.template = "cbi/network_netlist" - rpn.widget = "checkbox" - rpn.cast = "string" - rpn:depends({ rebind_protection = 2 }) - rpn:depends({ rebind_protection = 3 }) - --TODO: dnsmasq needs to not reference resolve-file and get off port 53. --Resource Tuning Tab @@ -235,15 +237,6 @@ if valman ~= "1" then rsc:value("tiny", translate("Tiny")) rsc.rmempty = false - ag2 = s1:taboption("resource", Value, "root_age", translate("Root DSKEY Age:"), - translate("Limit days between RFC 5011 copies to reduce flash writes")) - ag2.datatype = "and(uinteger,min(1),max(99))" - ag2:value("3", "3") - ag2:value("9", "9 ("..translate("default")..")") - ag2:value("12", "12") - ag2:value("24", "24") - ag2:value("99", "99 ("..translate("never")..")") - eds = s1:taboption("resource", Value, "edns_size", translate("EDNS Size:"), translate("Limit extended DNS packet size")) eds.datatype = "and(uinteger,min(512),max(4096))" @@ -257,30 +250,47 @@ if valman ~= "1" then stt = s1:taboption("resource", Flag, "extended_stats", translate("Extended Statistics:"), translate("Extended statistics are printed from unbound-control")) stt.rmempty = false +end - tgr = s1:taboption("resource", Value, "trigger_interface", translate("Trigger Networks:"), + +--Trigger Tab, always unconditional +ag2 = s1:taboption("trigger", Value, "root_age", translate("Root DSKEY Age:"), + translate("Limit days between RFC5011 copies to reduce flash writes")) +ag2.datatype = "and(uinteger,min(1),max(99))" +ag2:value("3", "3") +ag2:value("9", "9 ("..translate("default")..")") +ag2:value("12", "12") +ag2:value("24", "24") +ag2:value("99", "99 ("..translate("never")..")") + +tgr = s1:taboption("trigger", Value, "trigger_interface", translate("Trigger Networks:"), translate("Networks that may trigger Unbound to reload (avoid wan6)")) - tgr.template = "cbi/network_netlist" - tgr.widget = "checkbox" - tgr.cast = "string" - -else - s1:tab("rfc5011", translate("RFC5011"), - translatef("<h3>Unbound RFC5011 Settings</h3>\n" - .. "RFC5011 copy scripts protect flash ROM even with UCI disabled.")) - - ag2 = s1:taboption("rfc5011", Value, "root_age", translate("Root DSKEY Age:"), - translate("Limit days to copy /var/->/etc/ to reduce flash writes")) - ag2.datatype = "and(uinteger,min(1),max(99))" - ag2:value("3", "3") - ag2:value("9", "9 ("..translate("default")..")") - ag2:value("12", "12") - ag2:value("24", "24") - ag2:value("99", "99 ("..translate("never")..")") +tgr.template = "cbi/network_netlist" +tgr.widget = "checkbox" +tgr.rmempty = true +tgr.cast = "string" +tgr.nocreate = true + + +function ena.cfgvalue(self, section) + return luci.sys.init.enabled("unbound") and self.enabled or self.disabled +end + + +function ena.write(self, section, value) + if value == "1" then + luci.sys.init.enable("unbound") + luci.sys.call("/etc/init.d/unbound start >/dev/null") + else + luci.sys.call("/etc/init.d/unbound stop >/dev/null") + luci.sys.init.disable("unbound") + end + + return Flag.write(self, section, value) end -function m1.on_after_commit(self) +function m1.on_apply(self) function ena.validate(self, value) if value ~= "0" then luci.sys.call("/etc/init.d/unbound restart >/dev/null 2>&1") diff --git a/applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua b/applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua index 74b9d1d03..a2023926e 100644 --- a/applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua +++ b/applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua @@ -35,6 +35,9 @@ s:taboption("general", Flag, "enable_natpmp", translate("Enable NAT-PMP function s:taboption("general", Flag, "secure_mode", translate("Enable secure mode"), translate("Allow adding forwards only to requesting ip addresses")).default = "1" +s:taboption("general", Flag, "igdv1", translate("Enable IGDv1 mode"), + translate("Advertise as IGDv1 device instead of IGDv2")).default = "0" + s:taboption("general", Flag, "log_output", translate("Enable additional logging"), translate("Puts extra debugging information into the system log")) @@ -71,7 +74,7 @@ pu = s:taboption("advanced", Value, "presentation_url", translate("Presentation pu.placeholder = "http://192.168.1.1/" lf = s:taboption("advanced", Value, "upnp_lease_file", translate("UPnP lease file")) -lf.placeholder = "/var/log/upnp.leases" +lf.placeholder = "/var/run/miniupnpd.leases" s2 = m:section(TypedSection, "perm_rule", translate("MiniUPnP ACLs"), diff --git a/applications/luci-app-upnp/po/ca/upnp.po b/applications/luci-app-upnp/po/ca/upnp.po index 2767ade5b..398c87ecb 100644 --- a/applications/luci-app-upnp/po/ca/upnp.po +++ b/applications/luci-app-upnp/po/ca/upnp.po @@ -31,6 +31,9 @@ msgstr "Redireccions UPnP actives" msgid "Advanced Settings" msgstr "Ajusts avançats" +msgid "Advertise as IGDv1 device instead of IGDv2" +msgstr "" + msgid "Allow adding forwards only to requesting ip addresses" msgstr "Permet que s'afegeixin redireccions només a les adreces IP peticionant" @@ -70,6 +73,9 @@ msgstr "UUID de dispositiu" msgid "Downlink" msgstr "Enllaç de baixada" +msgid "Enable IGDv1 mode" +msgstr "" + msgid "Enable NAT-PMP functionality" msgstr "Habilita la funcionalitat NAT-PMP" diff --git a/applications/luci-app-upnp/po/cs/upnp.po b/applications/luci-app-upnp/po/cs/upnp.po index bfc97cca5..adb4d19ab 100644 --- a/applications/luci-app-upnp/po/cs/upnp.po +++ b/applications/luci-app-upnp/po/cs/upnp.po @@ -27,6 +27,9 @@ msgstr "Aktivní přesměrování UPnP" msgid "Advanced Settings" msgstr "Pokročilé nastavení" +msgid "Advertise as IGDv1 device instead of IGDv2" +msgstr "" + msgid "Allow adding forwards only to requesting ip addresses" msgstr "Povolit přesměrování pouze na dotazující ip adresy" @@ -66,6 +69,9 @@ msgstr "UUID zařízení" msgid "Downlink" msgstr "Downlink" +msgid "Enable IGDv1 mode" +msgstr "" + msgid "Enable NAT-PMP functionality" msgstr "Povolit funkčnost NAT-PMP" diff --git a/applications/luci-app-upnp/po/de/upnp.po b/applications/luci-app-upnp/po/de/upnp.po index 46aa42ffe..bdafbf105 100644 --- a/applications/luci-app-upnp/po/de/upnp.po +++ b/applications/luci-app-upnp/po/de/upnp.po @@ -29,6 +29,9 @@ msgstr "Aktive UPnP-Weiterleitungen" msgid "Advanced Settings" msgstr "Erweiterte Einstellungen" +msgid "Advertise as IGDv1 device instead of IGDv2" +msgstr "" + msgid "Allow adding forwards only to requesting ip addresses" msgstr "Nur Weiterleitungen zurück zum anfordernden Client zulassen" @@ -68,6 +71,9 @@ msgstr "Geräte-UUID" msgid "Downlink" msgstr "Downlink" +msgid "Enable IGDv1 mode" +msgstr "" + msgid "Enable NAT-PMP functionality" msgstr "NAT-PMP Funktionalität aktivieren" diff --git a/applications/luci-app-upnp/po/el/upnp.po b/applications/luci-app-upnp/po/el/upnp.po index 79a02a487..c02b0ce29 100644 --- a/applications/luci-app-upnp/po/el/upnp.po +++ b/applications/luci-app-upnp/po/el/upnp.po @@ -26,6 +26,9 @@ msgstr "" msgid "Advanced Settings" msgstr "" +msgid "Advertise as IGDv1 device instead of IGDv2" +msgstr "" + msgid "Allow adding forwards only to requesting ip addresses" msgstr "" @@ -65,6 +68,9 @@ msgstr "" msgid "Downlink" msgstr "" +msgid "Enable IGDv1 mode" +msgstr "" + msgid "Enable NAT-PMP functionality" msgstr "" diff --git a/applications/luci-app-upnp/po/en/upnp.po b/applications/luci-app-upnp/po/en/upnp.po index 450e62a7c..eae23a13a 100644 --- a/applications/luci-app-upnp/po/en/upnp.po +++ b/applications/luci-app-upnp/po/en/upnp.po @@ -26,6 +26,9 @@ msgstr "" msgid "Advanced Settings" msgstr "" +msgid "Advertise as IGDv1 device instead of IGDv2" +msgstr "" + msgid "Allow adding forwards only to requesting ip addresses" msgstr "" @@ -65,6 +68,9 @@ msgstr "" msgid "Downlink" msgstr "Downlink" +msgid "Enable IGDv1 mode" +msgstr "" + msgid "Enable NAT-PMP functionality" msgstr "" diff --git a/applications/luci-app-upnp/po/es/upnp.po b/applications/luci-app-upnp/po/es/upnp.po index 8c26b3cf5..6c9c26260 100644 --- a/applications/luci-app-upnp/po/es/upnp.po +++ b/applications/luci-app-upnp/po/es/upnp.po @@ -29,6 +29,9 @@ msgstr "Redirecciones UPnP activas" msgid "Advanced Settings" msgstr "Configuración avanzada" +msgid "Advertise as IGDv1 device instead of IGDv2" +msgstr "" + msgid "Allow adding forwards only to requesting ip addresses" msgstr "Permitir añadir redirecciones sólo a IPs que lo soliciten" @@ -68,6 +71,9 @@ msgstr "UUID del dispositivo" msgid "Downlink" msgstr "Enlace para bajada" +msgid "Enable IGDv1 mode" +msgstr "" + msgid "Enable NAT-PMP functionality" msgstr "Activar la funcionalidad NAT-PMP" diff --git a/applications/luci-app-upnp/po/fr/upnp.po b/applications/luci-app-upnp/po/fr/upnp.po index 1f3f8635b..f8b2a8536 100644 --- a/applications/luci-app-upnp/po/fr/upnp.po +++ b/applications/luci-app-upnp/po/fr/upnp.po @@ -29,6 +29,9 @@ msgstr "Redirections UPnP actives" msgid "Advanced Settings" msgstr "Paramètres avancés" +msgid "Advertise as IGDv1 device instead of IGDv2" +msgstr "" + msgid "Allow adding forwards only to requesting ip addresses" msgstr "" "Permet d'ajouter des redirections seulement vers les adresses IP qui font " @@ -70,6 +73,9 @@ msgstr "UUID du périphérique" msgid "Downlink" msgstr "Lien descendant" +msgid "Enable IGDv1 mode" +msgstr "" + msgid "Enable NAT-PMP functionality" msgstr "Activer la fonctionnalité NAT-PMP" diff --git a/applications/luci-app-upnp/po/he/upnp.po b/applications/luci-app-upnp/po/he/upnp.po index 5b01f31b8..387444f15 100644 --- a/applications/luci-app-upnp/po/he/upnp.po +++ b/applications/luci-app-upnp/po/he/upnp.po @@ -22,6 +22,9 @@ msgstr "" msgid "Advanced Settings" msgstr "" +msgid "Advertise as IGDv1 device instead of IGDv2" +msgstr "" + msgid "Allow adding forwards only to requesting ip addresses" msgstr "" @@ -61,6 +64,9 @@ msgstr "" msgid "Downlink" msgstr "" +msgid "Enable IGDv1 mode" +msgstr "" + msgid "Enable NAT-PMP functionality" msgstr "" diff --git a/applications/luci-app-upnp/po/hu/upnp.po b/applications/luci-app-upnp/po/hu/upnp.po index 9f64e5a18..21bc7b59c 100644 --- a/applications/luci-app-upnp/po/hu/upnp.po +++ b/applications/luci-app-upnp/po/hu/upnp.po @@ -27,6 +27,9 @@ msgstr "Aktív UPnP átirányítások" msgid "Advanced Settings" msgstr "Haladó beállítások" +msgid "Advertise as IGDv1 device instead of IGDv2" +msgstr "" + msgid "Allow adding forwards only to requesting ip addresses" msgstr "" "Kizárólag a kérést küldő IP címre történő továbbítás hozzáadásának " @@ -68,6 +71,9 @@ msgstr "Eszköz UUID" msgid "Downlink" msgstr "Letöltés" +msgid "Enable IGDv1 mode" +msgstr "" + msgid "Enable NAT-PMP functionality" msgstr "NAT-PMP funkció engedélyezése" diff --git a/applications/luci-app-upnp/po/it/upnp.po b/applications/luci-app-upnp/po/it/upnp.po index 2eb4a4404..8e498c34b 100644 --- a/applications/luci-app-upnp/po/it/upnp.po +++ b/applications/luci-app-upnp/po/it/upnp.po @@ -29,6 +29,9 @@ msgstr "Attiva reindirizzamento UPnP" msgid "Advanced Settings" msgstr "Opzioni Avanzate" +msgid "Advertise as IGDv1 device instead of IGDv2" +msgstr "" + msgid "Allow adding forwards only to requesting ip addresses" msgstr "Permetti l'aggiunta della mappatura solo agli indirizzi IP richiedenti" @@ -68,6 +71,9 @@ msgstr "UUID del dispositivo" msgid "Downlink" msgstr "Downlink" +msgid "Enable IGDv1 mode" +msgstr "" + msgid "Enable NAT-PMP functionality" msgstr "Abilita il protocollo NAT-PMP" diff --git a/applications/luci-app-upnp/po/ja/upnp.po b/applications/luci-app-upnp/po/ja/upnp.po index fe2dd6456..4e6f879dc 100644 --- a/applications/luci-app-upnp/po/ja/upnp.po +++ b/applications/luci-app-upnp/po/ja/upnp.po @@ -29,6 +29,9 @@ msgstr "稼働中のUPnPリダイレクト" msgid "Advanced Settings" msgstr "詳細設定" +msgid "Advertise as IGDv1 device instead of IGDv2" +msgstr "" + msgid "Allow adding forwards only to requesting ip addresses" msgstr "要求元IPアドレスへの転送のみ、追加を許可します。" @@ -68,6 +71,9 @@ msgstr "デバイス UUID" msgid "Downlink" msgstr "ダウンリンク" +msgid "Enable IGDv1 mode" +msgstr "" + msgid "Enable NAT-PMP functionality" msgstr "NAT-PMP機能を有効にする" diff --git a/applications/luci-app-upnp/po/ms/upnp.po b/applications/luci-app-upnp/po/ms/upnp.po index 62d4d5aec..834d6546a 100644 --- a/applications/luci-app-upnp/po/ms/upnp.po +++ b/applications/luci-app-upnp/po/ms/upnp.po @@ -21,6 +21,9 @@ msgstr "" msgid "Advanced Settings" msgstr "" +msgid "Advertise as IGDv1 device instead of IGDv2" +msgstr "" + msgid "Allow adding forwards only to requesting ip addresses" msgstr "" @@ -60,6 +63,9 @@ msgstr "" msgid "Downlink" msgstr "" +msgid "Enable IGDv1 mode" +msgstr "" + msgid "Enable NAT-PMP functionality" msgstr "" diff --git a/applications/luci-app-upnp/po/no/upnp.po b/applications/luci-app-upnp/po/no/upnp.po index dc9daba1b..f313b42ee 100644 --- a/applications/luci-app-upnp/po/no/upnp.po +++ b/applications/luci-app-upnp/po/no/upnp.po @@ -20,6 +20,9 @@ msgstr "Aktive UPnP Viderekoblinger" msgid "Advanced Settings" msgstr "Avanserte Innstillinger" +msgid "Advertise as IGDv1 device instead of IGDv2" +msgstr "" + msgid "Allow adding forwards only to requesting ip addresses" msgstr "Tillat videkobling kun til IP adresser som ber om det" @@ -59,6 +62,9 @@ msgstr "Enhet UUID" msgid "Downlink" msgstr "Nedlinje" +msgid "Enable IGDv1 mode" +msgstr "" + msgid "Enable NAT-PMP functionality" msgstr "Aktiver NAT-PMP funksjonalitet" diff --git a/applications/luci-app-upnp/po/pl/upnp.po b/applications/luci-app-upnp/po/pl/upnp.po index 0afabe326..fb1f0a4bd 100644 --- a/applications/luci-app-upnp/po/pl/upnp.po +++ b/applications/luci-app-upnp/po/pl/upnp.po @@ -28,6 +28,9 @@ msgstr "Aktywne przekierowania UPnP" msgid "Advanced Settings" msgstr "Ustawienia zaawansowane" +msgid "Advertise as IGDv1 device instead of IGDv2" +msgstr "" + msgid "Allow adding forwards only to requesting ip addresses" msgstr "Zezwól na dodawanie przekierowań tylko do odpytujących adresów IP" @@ -67,6 +70,9 @@ msgstr "UUID urządzenia" msgid "Downlink" msgstr "Downlink" +msgid "Enable IGDv1 mode" +msgstr "" + msgid "Enable NAT-PMP functionality" msgstr "Włącz funkcjonalność NAT-PMP" diff --git a/applications/luci-app-upnp/po/pt-br/upnp.po b/applications/luci-app-upnp/po/pt-br/upnp.po index 72741d26c..705bbde61 100644 --- a/applications/luci-app-upnp/po/pt-br/upnp.po +++ b/applications/luci-app-upnp/po/pt-br/upnp.po @@ -29,6 +29,9 @@ msgstr "Redirecionamentos UPnP Ativos" msgid "Advanced Settings" msgstr "Configurações Avançadas" +msgid "Advertise as IGDv1 device instead of IGDv2" +msgstr "" + msgid "Allow adding forwards only to requesting ip addresses" msgstr "" "Permite adicionar encaminhamento apenas para o endereço IP requisitante" @@ -69,6 +72,9 @@ msgstr "UUID do Dispositivo" msgid "Downlink" msgstr "Velocidade de recebimento do enlace (downlink)" +msgid "Enable IGDv1 mode" +msgstr "" + msgid "Enable NAT-PMP functionality" msgstr "Habilite a função NAT-PMP" diff --git a/applications/luci-app-upnp/po/pt/upnp.po b/applications/luci-app-upnp/po/pt/upnp.po index 415a72b08..e1ee340e3 100644 --- a/applications/luci-app-upnp/po/pt/upnp.po +++ b/applications/luci-app-upnp/po/pt/upnp.po @@ -26,6 +26,9 @@ msgstr "" msgid "Advanced Settings" msgstr "" +msgid "Advertise as IGDv1 device instead of IGDv2" +msgstr "" + msgid "Allow adding forwards only to requesting ip addresses" msgstr "" @@ -65,6 +68,9 @@ msgstr "" msgid "Downlink" msgstr "Link para download" +msgid "Enable IGDv1 mode" +msgstr "" + msgid "Enable NAT-PMP functionality" msgstr "" diff --git a/applications/luci-app-upnp/po/ro/upnp.po b/applications/luci-app-upnp/po/ro/upnp.po index d5e5c7993..8525279d0 100644 --- a/applications/luci-app-upnp/po/ro/upnp.po +++ b/applications/luci-app-upnp/po/ro/upnp.po @@ -28,6 +28,9 @@ msgstr "Redirecturi active UPnP" msgid "Advanced Settings" msgstr "Setari avansate" +msgid "Advertise as IGDv1 device instead of IGDv2" +msgstr "" + msgid "Allow adding forwards only to requesting ip addresses" msgstr "Permite adaugarea forward-urilor doar catre adresele ip solicitante" @@ -67,6 +70,9 @@ msgstr "UUID al dispozitivului" msgid "Downlink" msgstr "Downlink" +msgid "Enable IGDv1 mode" +msgstr "" + msgid "Enable NAT-PMP functionality" msgstr "Activeaza functionalitatea NAT-PMP" diff --git a/applications/luci-app-upnp/po/ru/upnp.po b/applications/luci-app-upnp/po/ru/upnp.po index 80953578b..878f83eaf 100644 --- a/applications/luci-app-upnp/po/ru/upnp.po +++ b/applications/luci-app-upnp/po/ru/upnp.po @@ -31,6 +31,9 @@ msgstr "Активные UPnP-переадресации" msgid "Advanced Settings" msgstr "Дополнительные настройки" +msgid "Advertise as IGDv1 device instead of IGDv2" +msgstr "" + msgid "Allow adding forwards only to requesting ip addresses" msgstr "Разрешить перенаправление только для запрашивающих IP-адресов." @@ -70,6 +73,9 @@ msgstr "UUID устройства" msgid "Downlink" msgstr "Внутреннее соединение" +msgid "Enable IGDv1 mode" +msgstr "" + msgid "Enable NAT-PMP functionality" msgstr "Включить NAT-PMP" diff --git a/applications/luci-app-upnp/po/sk/upnp.po b/applications/luci-app-upnp/po/sk/upnp.po index ccd256c71..81ded2220 100644 --- a/applications/luci-app-upnp/po/sk/upnp.po +++ b/applications/luci-app-upnp/po/sk/upnp.po @@ -22,6 +22,9 @@ msgstr "" msgid "Advanced Settings" msgstr "" +msgid "Advertise as IGDv1 device instead of IGDv2" +msgstr "" + msgid "Allow adding forwards only to requesting ip addresses" msgstr "" @@ -61,6 +64,9 @@ msgstr "" msgid "Downlink" msgstr "" +msgid "Enable IGDv1 mode" +msgstr "" + msgid "Enable NAT-PMP functionality" msgstr "" diff --git a/applications/luci-app-upnp/po/sv/upnp.po b/applications/luci-app-upnp/po/sv/upnp.po index 10fef558e..c2d1c6b0b 100644 --- a/applications/luci-app-upnp/po/sv/upnp.po +++ b/applications/luci-app-upnp/po/sv/upnp.po @@ -25,6 +25,9 @@ msgstr "Aktivera UPnP-omdirigeringar" msgid "Advanced Settings" msgstr "Avancerade inställningar" +msgid "Advertise as IGDv1 device instead of IGDv2" +msgstr "" + msgid "Allow adding forwards only to requesting ip addresses" msgstr "" @@ -64,6 +67,9 @@ msgstr "Enhetens UUID" msgid "Downlink" msgstr "Nerlänk" +msgid "Enable IGDv1 mode" +msgstr "" + msgid "Enable NAT-PMP functionality" msgstr "Aktivera NAT-PMP-funktionalitet" diff --git a/applications/luci-app-upnp/po/templates/upnp.pot b/applications/luci-app-upnp/po/templates/upnp.pot index dda0e7ea3..e3b1f1a26 100644 --- a/applications/luci-app-upnp/po/templates/upnp.pot +++ b/applications/luci-app-upnp/po/templates/upnp.pot @@ -15,6 +15,9 @@ msgstr "" msgid "Advanced Settings" msgstr "" +msgid "Advertise as IGDv1 device instead of IGDv2" +msgstr "" + msgid "Allow adding forwards only to requesting ip addresses" msgstr "" @@ -54,6 +57,9 @@ msgstr "" msgid "Downlink" msgstr "" +msgid "Enable IGDv1 mode" +msgstr "" + msgid "Enable NAT-PMP functionality" msgstr "" diff --git a/applications/luci-app-upnp/po/tr/upnp.po b/applications/luci-app-upnp/po/tr/upnp.po index 1bcd2b73a..2a997a79b 100644 --- a/applications/luci-app-upnp/po/tr/upnp.po +++ b/applications/luci-app-upnp/po/tr/upnp.po @@ -22,6 +22,9 @@ msgstr "" msgid "Advanced Settings" msgstr "" +msgid "Advertise as IGDv1 device instead of IGDv2" +msgstr "" + msgid "Allow adding forwards only to requesting ip addresses" msgstr "" @@ -61,6 +64,9 @@ msgstr "" msgid "Downlink" msgstr "" +msgid "Enable IGDv1 mode" +msgstr "" + msgid "Enable NAT-PMP functionality" msgstr "" diff --git a/applications/luci-app-upnp/po/uk/upnp.po b/applications/luci-app-upnp/po/uk/upnp.po index 746fd3e88..8f43ae371 100644 --- a/applications/luci-app-upnp/po/uk/upnp.po +++ b/applications/luci-app-upnp/po/uk/upnp.po @@ -28,6 +28,9 @@ msgstr "Активні переспрямування UPnP" msgid "Advanced Settings" msgstr "Додаткові параметри" +msgid "Advertise as IGDv1 device instead of IGDv2" +msgstr "" + msgid "Allow adding forwards only to requesting ip addresses" msgstr "" "Дозволити додавання переспрямування тільки для IP-адрес, що надсилають запити" @@ -68,6 +71,9 @@ msgstr "UUID пристрою" msgid "Downlink" msgstr "Низхідний канал" +msgid "Enable IGDv1 mode" +msgstr "" + msgid "Enable NAT-PMP functionality" msgstr "Увімкнути функцію NAT-PMP" diff --git a/applications/luci-app-upnp/po/vi/upnp.po b/applications/luci-app-upnp/po/vi/upnp.po index d27720d2a..c93377747 100644 --- a/applications/luci-app-upnp/po/vi/upnp.po +++ b/applications/luci-app-upnp/po/vi/upnp.po @@ -27,6 +27,9 @@ msgstr "" msgid "Advanced Settings" msgstr "" +msgid "Advertise as IGDv1 device instead of IGDv2" +msgstr "" + msgid "Allow adding forwards only to requesting ip addresses" msgstr "" @@ -66,6 +69,9 @@ msgstr "" msgid "Downlink" msgstr "Downlink" +msgid "Enable IGDv1 mode" +msgstr "" + msgid "Enable NAT-PMP functionality" msgstr "" diff --git a/applications/luci-app-upnp/po/zh-cn/upnp.po b/applications/luci-app-upnp/po/zh-cn/upnp.po index 894de1c26..588ad2cf1 100644 --- a/applications/luci-app-upnp/po/zh-cn/upnp.po +++ b/applications/luci-app-upnp/po/zh-cn/upnp.po @@ -27,6 +27,9 @@ msgstr "活动的 UPnP 重定向" msgid "Advanced Settings" msgstr "高级设置" +msgid "Advertise as IGDv1 device instead of IGDv2" +msgstr "" + msgid "Allow adding forwards only to requesting ip addresses" msgstr "允许只向请求的 IP 地址添加转发" @@ -66,6 +69,9 @@ msgstr "设备 UUID" msgid "Downlink" msgstr "下行速率" +msgid "Enable IGDv1 mode" +msgstr "" + msgid "Enable NAT-PMP functionality" msgstr "启用 NAT-PMP 功能" diff --git a/applications/luci-app-upnp/po/zh-tw/upnp.po b/applications/luci-app-upnp/po/zh-tw/upnp.po index 338a6629e..57edb9e46 100644 --- a/applications/luci-app-upnp/po/zh-tw/upnp.po +++ b/applications/luci-app-upnp/po/zh-tw/upnp.po @@ -25,6 +25,9 @@ msgstr "啓用UPnP從導" msgid "Advanced Settings" msgstr "進階設定" +msgid "Advertise as IGDv1 device instead of IGDv2" +msgstr "" + msgid "Allow adding forwards only to requesting ip addresses" msgstr "只允許請求的IP位址新增從導機制" @@ -64,6 +67,9 @@ msgstr "設備UUID獨立識別碼" msgid "Downlink" msgstr "下載" +msgid "Enable IGDv1 mode" +msgstr "" + msgid "Enable NAT-PMP functionality" msgstr "啓用蘋果NAT-PMP傳輸埠對應通訊協定功能" diff --git a/modules/luci-base/htdocs/luci-static/resources/xhr.js b/modules/luci-base/htdocs/luci-static/resources/xhr.js index 91dcf3fef..de4476cdd 100644 --- a/modules/luci-base/htdocs/luci-static/resources/xhr.js +++ b/modules/luci-base/htdocs/luci-static/resources/xhr.js @@ -54,11 +54,11 @@ XHR = function() else url += '?' + code; + xhr.open('GET', url, true); + if (!isNaN(timeout)) xhr.timeout = timeout; - xhr.open('GET', url, true); - xhr.onreadystatechange = function() { if (xhr.readyState == 4) { @@ -92,10 +92,11 @@ XHR = function() callback(xhr); } + xhr.open('POST', url, true); + if (!isNaN(timeout)) xhr.timeout = timeout; - xhr.open('POST', url, true); xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded'); xhr.send(code); } diff --git a/modules/luci-base/luasrc/dispatcher.lua b/modules/luci-base/luasrc/dispatcher.lua index 1984fc4ad..38932afae 100644 --- a/modules/luci-base/luasrc/dispatcher.lua +++ b/modules/luci-base/luasrc/dispatcher.lua @@ -428,7 +428,9 @@ function dispatch(request) return end - http.header("Set-Cookie", 'sysauth=%s; path=%s' %{ sid, build_url() }) + http.header("Set-Cookie", 'sysauth=%s; path=%s; HttpOnly%s' %{ + sid, build_url(), http.getenv("HTTPS") == "on" and "; secure" or "" + }) http.redirect(build_url(unpack(ctx.requestpath))) end diff --git a/modules/luci-base/luasrc/view/cbi/footer.htm b/modules/luci-base/luasrc/view/cbi/footer.htm index 4d332fd07..e6acfb069 100644 --- a/modules/luci-base/luasrc/view/cbi/footer.htm +++ b/modules/luci-base/luasrc/view/cbi/footer.htm @@ -1,6 +1,6 @@ <%- if pageaction then -%> <div class="cbi-page-actions"> - <% if redirect then %> + <% if redirect and not flow.hidebackbtn then %> <div style="float:left"> <input class="cbi-button cbi-button-link" type="button" value="<%:Back to Overview%>" onclick="location.href='<%=pcdata(redirect)%>'" /> </div> diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po index c413b7172..b08344b40 100644 --- a/modules/luci-base/po/ca/base.po +++ b/modules/luci-base/po/ca/base.po @@ -1017,6 +1017,11 @@ msgstr "Emergència" msgid "Enable" msgstr "Habilita" +msgid "" +"Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> " +"snooping" +msgstr "" + msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgstr "Habilita l'<abbr title=\"Spanning Tree Protocol\">STP</abbr>" @@ -1074,6 +1079,9 @@ msgstr "Activa/Desactiva" msgid "Enabled" msgstr "Habilitat" +msgid "Enables IGMP snooping on this bridge" +msgstr "" + msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" @@ -3537,7 +3545,7 @@ msgstr "" msgid "" "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</" -"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed " +"em> identifies the host, the <em>IPv4-Address</em> specifies the fixed " "address to use, and the <em>Hostname</em> is assigned as a symbolic name to " "the requesting host. The optional <em>Lease time</em> can be used to set non-" "standard host-specific lease time, e.g. 12h, 3d or infinite." diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po index 89714cc81..aa4144758 100644 --- a/modules/luci-base/po/cs/base.po +++ b/modules/luci-base/po/cs/base.po @@ -1017,6 +1017,11 @@ msgstr "Záchrana" msgid "Enable" msgstr "Povolit" +msgid "" +"Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> " +"snooping" +msgstr "" + msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgstr "Povolit <abbr title=\"Spanning Tree Protocol\">STP</abbr>" @@ -1074,6 +1079,9 @@ msgstr "Povolit/Zakázat" msgid "Enabled" msgstr "Povoleno" +msgid "Enables IGMP snooping on this bridge" +msgstr "" + msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" @@ -3577,7 +3585,7 @@ msgstr "Použít směrovací tabulku" msgid "" "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</" -"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed " +"em> identifies the host, the <em>IPv4-Address</em> specifies the fixed " "address to use, and the <em>Hostname</em> is assigned as a symbolic name to " "the requesting host. The optional <em>Lease time</em> can be used to set non-" "standard host-specific lease time, e.g. 12h, 3d or infinite." diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po index fd495b950..574ddf184 100644 --- a/modules/luci-base/po/de/base.po +++ b/modules/luci-base/po/de/base.po @@ -1043,6 +1043,11 @@ msgstr "Notfall" msgid "Enable" msgstr "Aktivieren" +msgid "" +"Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> " +"snooping" +msgstr "" + msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgstr "<abbr title=\"Spanning Tree Protocol\">STP</abbr> aktivieren" @@ -1101,6 +1106,9 @@ msgstr "Aktivieren/Deaktivieren" msgid "Enabled" msgstr "Aktiviert" +msgid "Enables IGMP snooping on this bridge" +msgstr "" + msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" @@ -3486,7 +3494,7 @@ msgid "" "This is the content of /etc/rc.local. Insert your own commands here (in " "front of 'exit 0') to execute them at the end of the boot process." msgstr "" -"Dies ist der Inhalt von /etc.rc.local. Hier kann man eigene Befehle einfügen " +"Dies ist der Inhalt von /etc/rc.local. Hier kann man eigene Befehle einfügen " "(vor 'exit 0'), die dann am Ende des Bootvorgangs ausgeführt werden." msgid "" @@ -3714,7 +3722,7 @@ msgstr "Benutze Routing-Tabelle" msgid "" "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</" -"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed " +"em> identifies the host, the <em>IPv4-Address</em> specifies the fixed " "address to use, and the <em>Hostname</em> is assigned as a symbolic name to " "the requesting host. The optional <em>Lease time</em> can be used to set non-" "standard host-specific lease time, e.g. 12h, 3d or infinite." diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po index ad5ed07fb..f746db32a 100644 --- a/modules/luci-base/po/el/base.po +++ b/modules/luci-base/po/el/base.po @@ -1029,6 +1029,11 @@ msgstr "Έκτακτη ανάγκη" msgid "Enable" msgstr "Ενεργοποίηση" +msgid "" +"Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> " +"snooping" +msgstr "" + msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgstr "Ενεργοποίηση <abbr title=\"Spanning Tree Protocol\">STP</abbr>" @@ -1086,6 +1091,9 @@ msgstr "Ενεργοποίηση/Απενεργοποίηση" msgid "Enabled" msgstr "Ενεργοποιημένο" +msgid "Enables IGMP snooping on this bridge" +msgstr "" + msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" @@ -3533,7 +3541,7 @@ msgstr "" msgid "" "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</" -"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed " +"em> identifies the host, the <em>IPv4-Address</em> specifies the fixed " "address to use, and the <em>Hostname</em> is assigned as a symbolic name to " "the requesting host. The optional <em>Lease time</em> can be used to set non-" "standard host-specific lease time, e.g. 12h, 3d or infinite." diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po index f62913595..50a7c9281 100644 --- a/modules/luci-base/po/en/base.po +++ b/modules/luci-base/po/en/base.po @@ -1008,6 +1008,11 @@ msgstr "" msgid "Enable" msgstr "" +msgid "" +"Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> " +"snooping" +msgstr "" + msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgstr "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" @@ -1065,6 +1070,9 @@ msgstr "Enable/Disable" msgid "Enabled" msgstr "Enabled" +msgid "Enables IGMP snooping on this bridge" +msgstr "" + msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" @@ -3490,7 +3498,7 @@ msgstr "" msgid "" "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</" -"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed " +"em> identifies the host, the <em>IPv4-Address</em> specifies the fixed " "address to use, and the <em>Hostname</em> is assigned as a symbolic name to " "the requesting host. The optional <em>Lease time</em> can be used to set non-" "standard host-specific lease time, e.g. 12h, 3d or infinite." diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po index 776f7fb15..8aed2e9ee 100644 --- a/modules/luci-base/po/es/base.po +++ b/modules/luci-base/po/es/base.po @@ -1023,6 +1023,11 @@ msgstr "Emergencia" msgid "Enable" msgstr "Activar" +msgid "" +"Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> " +"snooping" +msgstr "" + msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgstr "Activar <abbr title=\"Spanning Tree Protocol\">STP</abbr>" @@ -1080,6 +1085,9 @@ msgstr "Activar/Desactivar" msgid "Enabled" msgstr "Activado" +msgid "Enables IGMP snooping on this bridge" +msgstr "" + msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" @@ -3602,7 +3610,7 @@ msgstr "Usar tabla de rutas" msgid "" "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</" -"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed " +"em> identifies the host, the <em>IPv4-Address</em> specifies the fixed " "address to use, and the <em>Hostname</em> is assigned as a symbolic name to " "the requesting host. The optional <em>Lease time</em> can be used to set non-" "standard host-specific lease time, e.g. 12h, 3d or infinite." diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po index 9de168720..e09343815 100644 --- a/modules/luci-base/po/fr/base.po +++ b/modules/luci-base/po/fr/base.po @@ -1033,6 +1033,11 @@ msgstr "Urgence" msgid "Enable" msgstr "Activer" +msgid "" +"Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> " +"snooping" +msgstr "" + msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgstr "Activer le protocole <abbr title=\"Spanning Tree Protocol\">STP</abbr>" @@ -1090,6 +1095,9 @@ msgstr "Activer/Désactiver" msgid "Enabled" msgstr "Activé" +msgid "Enables IGMP snooping on this bridge" +msgstr "" + msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" @@ -3621,7 +3629,7 @@ msgstr "Utiliser la table de routage" msgid "" "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</" -"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed " +"em> identifies the host, the <em>IPv4-Address</em> specifies the fixed " "address to use, and the <em>Hostname</em> is assigned as a symbolic name to " "the requesting host. The optional <em>Lease time</em> can be used to set non-" "standard host-specific lease time, e.g. 12h, 3d or infinite." diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po index 8d5daf389..cb4c74a3f 100644 --- a/modules/luci-base/po/he/base.po +++ b/modules/luci-base/po/he/base.po @@ -993,6 +993,11 @@ msgstr "מצב חרום" msgid "Enable" msgstr "אפשר" +msgid "" +"Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> " +"snooping" +msgstr "" + msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgstr "אפשר <abbr title=\"Spanning Tree Protocol\">STP</abbr>" @@ -1050,6 +1055,9 @@ msgstr "" msgid "Enabled" msgstr "אפשר" +msgid "Enables IGMP snooping on this bridge" +msgstr "" + msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" @@ -3448,7 +3456,7 @@ msgstr "השתמש בטבלת ניתוב" msgid "" "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</" -"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed " +"em> identifies the host, the <em>IPv4-Address</em> specifies the fixed " "address to use, and the <em>Hostname</em> is assigned as a symbolic name to " "the requesting host. The optional <em>Lease time</em> can be used to set non-" "standard host-specific lease time, e.g. 12h, 3d or infinite." diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po index 5e2ea2b17..e49b5303f 100644 --- a/modules/luci-base/po/hu/base.po +++ b/modules/luci-base/po/hu/base.po @@ -1026,6 +1026,11 @@ msgstr "Vészhelyzet" msgid "Enable" msgstr "Engedélyezés" +msgid "" +"Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> " +"snooping" +msgstr "" + msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgstr "<abbr title=\"Spanning Tree Protocol\">STP</abbr> engedélyezése" @@ -1083,6 +1088,9 @@ msgstr "Engedélyezés/Letiltás" msgid "Enabled" msgstr "Engedélyezve" +msgid "Enables IGMP snooping on this bridge" +msgstr "" + msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" @@ -3608,7 +3616,7 @@ msgstr "Útválasztó tábla használata" msgid "" "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</" -"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed " +"em> identifies the host, the <em>IPv4-Address</em> specifies the fixed " "address to use, and the <em>Hostname</em> is assigned as a symbolic name to " "the requesting host. The optional <em>Lease time</em> can be used to set non-" "standard host-specific lease time, e.g. 12h, 3d or infinite." diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po index 6b55e23e2..ce866d9e7 100644 --- a/modules/luci-base/po/it/base.po +++ b/modules/luci-base/po/it/base.po @@ -1029,6 +1029,11 @@ msgstr "Emergenza" msgid "Enable" msgstr "Abilita" +msgid "" +"Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> " +"snooping" +msgstr "" + msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgstr "Abilita <abbr title=\"Spanning Tree Protocol\">STP</abbr>" @@ -1086,6 +1091,9 @@ msgstr "Abilita/Disabilita" msgid "Enabled" msgstr "Abilitato" +msgid "Enables IGMP snooping on this bridge" +msgstr "" + msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" @@ -3565,7 +3573,7 @@ msgstr "Utilizzare tabella di instradamento" msgid "" "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</" -"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed " +"em> identifies the host, the <em>IPv4-Address</em> specifies the fixed " "address to use, and the <em>Hostname</em> is assigned as a symbolic name to " "the requesting host. The optional <em>Lease time</em> can be used to set non-" "standard host-specific lease time, e.g. 12h, 3d or infinite." diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po index b643e8cf5..07eeec5ee 100644 --- a/modules/luci-base/po/ja/base.po +++ b/modules/luci-base/po/ja/base.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-06-10 03:40+0200\n" -"PO-Revision-Date: 2018-04-26 00:23+0900\n" +"PO-Revision-Date: 2018-05-03 00:23+0900\n" "Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n" "Language: ja\n" "MIME-Version: 1.0\n" @@ -962,7 +962,7 @@ msgid "Domain whitelist" msgstr "ドメイン ホワイトリスト" msgid "Don't Fragment" -msgstr "" +msgstr "非フラグメント化" msgid "" "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without " @@ -1033,6 +1033,13 @@ msgstr "緊急" msgid "Enable" msgstr "有効" +msgid "" +"Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> " +"snooping" +msgstr "" +"<abbr title=\"Internet Group Management Protocol\">IGMP</abbr> スヌーピングの" +"有効化" + msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgstr "<abbr title=\"Spanning Tree Protocol\">STP</abbr>を有効にする" @@ -1076,7 +1083,7 @@ msgid "Enable mirroring of outgoing packets" msgstr "送信パケットのミラーリングを有効化" msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets." -msgstr "" +msgstr "カプセル化されたパケットの DF (Don't Fragment) フラグを有効にします。" msgid "Enable this mount" msgstr "マウント設定を有効にする" @@ -1090,6 +1097,9 @@ msgstr "有効/無効" msgid "Enabled" msgstr "有効" +msgid "Enables IGMP snooping on this bridge" +msgstr "ブリッジの IGMP スヌーピングを有効にします" + msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" @@ -1607,6 +1617,8 @@ msgstr "インストール" msgid "Install iputils-traceroute6 for IPv6 traceroute" msgstr "" +"IPv6 の traceroute を使用するには、 iputils-traceroute6 をインストールしま" +"す。" msgid "Install package %q" msgstr "%q パッケージをインストールします" @@ -2193,6 +2205,8 @@ msgstr "Nslookup" msgid "Number of cached DNS entries (max is 10000, 0 is no caching)" msgstr "" +"キャッシュされる DNS エントリーの数です。（最大 10000 件。 0の場合はキャッ" +"シュしません）" msgid "OK" msgstr "OK" @@ -2410,7 +2424,7 @@ msgid "Packets" msgstr "パケット" msgid "Part of zone %q" -msgstr "ゾーン %qの一部" +msgstr "ゾーン %q の一部" msgid "Password" msgstr "パスワード" @@ -2979,7 +2993,7 @@ msgid "Size (.ipk)" msgstr "サイズ (.ipk)" msgid "Size of DNS query cache" -msgstr "" +msgstr "DNS クエリ キャッシュのサイズ" msgid "Skip" msgstr "スキップ" @@ -3613,7 +3627,7 @@ msgstr "ルーティング テーブルの使用" msgid "" "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</" -"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed " +"em> identifies the host, the <em>IPv4-Address</em> specifies the fixed " "address to use, and the <em>Hostname</em> is assigned as a symbolic name to " "the requesting host. The optional <em>Lease time</em> can be used to set non-" "standard host-specific lease time, e.g. 12h, 3d or infinite." diff --git a/modules/luci-base/po/ko/base.po b/modules/luci-base/po/ko/base.po index 04d3c6a23..e4f77c78f 100644 --- a/modules/luci-base/po/ko/base.po +++ b/modules/luci-base/po/ko/base.po @@ -1006,6 +1006,11 @@ msgstr "" msgid "Enable" msgstr "활성화" +msgid "" +"Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> " +"snooping" +msgstr "" + msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgstr "<abbr title=\"Spanning Tree Protocol\">STP</abbr> 활성화" @@ -1063,6 +1068,9 @@ msgstr "활성/비활성" msgid "Enabled" msgstr "활성화됨" +msgid "Enables IGMP snooping on this bridge" +msgstr "" + msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" @@ -3495,7 +3503,7 @@ msgstr "Routing table 사용" msgid "" "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</" -"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed " +"em> identifies the host, the <em>IPv4-Address</em> specifies the fixed " "address to use, and the <em>Hostname</em> is assigned as a symbolic name to " "the requesting host. The optional <em>Lease time</em> can be used to set non-" "standard host-specific lease time, e.g. 12h, 3d or infinite." diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po index b478bd623..d5c889580 100644 --- a/modules/luci-base/po/ms/base.po +++ b/modules/luci-base/po/ms/base.po @@ -978,6 +978,11 @@ msgstr "" msgid "Enable" msgstr "" +msgid "" +"Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> " +"snooping" +msgstr "" + msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgstr "Mengaktifkan <abbr title=\"Spanning Tree Protocol\">STP</abbr>" @@ -1035,6 +1040,9 @@ msgstr "" msgid "Enabled" msgstr "" +msgid "Enables IGMP snooping on this bridge" +msgstr "" + msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" @@ -3463,7 +3471,7 @@ msgstr "" msgid "" "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</" -"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed " +"em> identifies the host, the <em>IPv4-Address</em> specifies the fixed " "address to use, and the <em>Hostname</em> is assigned as a symbolic name to " "the requesting host. The optional <em>Lease time</em> can be used to set non-" "standard host-specific lease time, e.g. 12h, 3d or infinite." diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po index 502c3b38a..1805d8e99 100644 --- a/modules/luci-base/po/no/base.po +++ b/modules/luci-base/po/no/base.po @@ -1013,6 +1013,11 @@ msgstr "Krisesituasjon" msgid "Enable" msgstr "Aktiver" +msgid "" +"Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> " +"snooping" +msgstr "" + msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgstr "Aktiver <abbr title=\"Spanning Tree Protocol\">STP</abbr>" @@ -1070,6 +1075,9 @@ msgstr "Aktiver/Deaktiver" msgid "Enabled" msgstr "Aktivert" +msgid "Enables IGMP snooping on this bridge" +msgstr "" + msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" @@ -3573,7 +3581,7 @@ msgstr "Bruk rutingtabellen" msgid "" "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</" -"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed " +"em> identifies the host, the <em>IPv4-Address</em> specifies the fixed " "address to use, and the <em>Hostname</em> is assigned as a symbolic name to " "the requesting host. The optional <em>Lease time</em> can be used to set non-" "standard host-specific lease time, e.g. 12h, 3d or infinite." diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po index 956e566e9..5e2fbaeee 100644 --- a/modules/luci-base/po/pl/base.po +++ b/modules/luci-base/po/pl/base.po @@ -1039,6 +1039,11 @@ msgstr "Zagrożenie" msgid "Enable" msgstr "Włącz" +msgid "" +"Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> " +"snooping" +msgstr "" + msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgstr "Włącz <abbr title=\"Spanning Tree Protocol\">STP</abbr>" @@ -1096,6 +1101,9 @@ msgstr "Wlącz/Wyłącz" msgid "Enabled" msgstr "Włączony" +msgid "Enables IGMP snooping on this bridge" +msgstr "" + msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" @@ -3633,7 +3641,7 @@ msgstr "Użyj tabeli routingu" msgid "" "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</" -"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed " +"em> identifies the host, the <em>IPv4-Address</em> specifies the fixed " "address to use, and the <em>Hostname</em> is assigned as a symbolic name to " "the requesting host. The optional <em>Lease time</em> can be used to set non-" "standard host-specific lease time, e.g. 12h, 3d or infinite." diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po index 9c4901f3d..a51d11d2a 100644 --- a/modules/luci-base/po/pt-br/base.po +++ b/modules/luci-base/po/pt-br/base.po @@ -1075,6 +1075,11 @@ msgstr "Emergência" msgid "Enable" msgstr "Ativar" +msgid "" +"Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> " +"snooping" +msgstr "" + msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgstr "Ativar <abbr title=\"Spanning Tree Protocol\">STP</abbr>" @@ -1132,6 +1137,9 @@ msgstr "Ativar/Desativar" msgid "Enabled" msgstr "Ativado" +msgid "Enables IGMP snooping on this bridge" +msgstr "" + msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" @@ -3756,7 +3764,7 @@ msgstr "Use a tabela de roteamento" msgid "" "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</" -"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed " +"em> identifies the host, the <em>IPv4-Address</em> specifies the fixed " "address to use, and the <em>Hostname</em> is assigned as a symbolic name to " "the requesting host. The optional <em>Lease time</em> can be used to set non-" "standard host-specific lease time, e.g. 12h, 3d or infinite." diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po index 8f2622c26..843a4cac8 100644 --- a/modules/luci-base/po/pt/base.po +++ b/modules/luci-base/po/pt/base.po @@ -1029,6 +1029,11 @@ msgstr "Emergência" msgid "Enable" msgstr "Ativar" +msgid "" +"Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> " +"snooping" +msgstr "" + msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgstr "Ativar <abbr title=\"Spanning Tree Protocol\">STP</abbr>" @@ -1086,6 +1091,9 @@ msgstr "Ativar/Desativar" msgid "Enabled" msgstr "Ativado" +msgid "Enables IGMP snooping on this bridge" +msgstr "" + msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" @@ -3571,7 +3579,7 @@ msgstr "Usar tabela de roteamento" msgid "" "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</" -"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed " +"em> identifies the host, the <em>IPv4-Address</em> specifies the fixed " "address to use, and the <em>Hostname</em> is assigned as a symbolic name to " "the requesting host. The optional <em>Lease time</em> can be used to set non-" "standard host-specific lease time, e.g. 12h, 3d or infinite." diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po index 86eaa6495..748bfdbc5 100644 --- a/modules/luci-base/po/ro/base.po +++ b/modules/luci-base/po/ro/base.po @@ -984,6 +984,11 @@ msgstr "Urgenta" msgid "Enable" msgstr "Activeaza" +msgid "" +"Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> " +"snooping" +msgstr "" + msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgstr "Activeaza <abbr title=\"Spanning Tree Protocol\">STP</abbr>" @@ -1041,6 +1046,9 @@ msgstr "Activeaza/Dezactiveaza" msgid "Enabled" msgstr "Activat" +msgid "Enables IGMP snooping on this bridge" +msgstr "" + msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" @@ -3439,7 +3447,7 @@ msgstr "" msgid "" "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</" -"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed " +"em> identifies the host, the <em>IPv4-Address</em> specifies the fixed " "address to use, and the <em>Hostname</em> is assigned as a symbolic name to " "the requesting host. The optional <em>Lease time</em> can be used to set non-" "standard host-specific lease time, e.g. 12h, 3d or infinite." diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po index 4ffb7233c..35a697620 100644 --- a/modules/luci-base/po/ru/base.po +++ b/modules/luci-base/po/ru/base.po @@ -1060,6 +1060,11 @@ msgstr "Чрезвычайная ситуация" msgid "Enable" msgstr "Включить" +msgid "" +"Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> " +"snooping" +msgstr "" + msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgstr "Включить <abbr title=\"Spanning Tree Protocol\">STP</abbr>" @@ -1117,6 +1122,9 @@ msgstr "Включить/выключить" msgid "Enabled" msgstr "Включено" +msgid "Enables IGMP snooping on this bridge" +msgstr "" + msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" @@ -3704,7 +3712,7 @@ msgstr "Использовать таблицу маршрутизации" msgid "" "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</" -"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed " +"em> identifies the host, the <em>IPv4-Address</em> specifies the fixed " "address to use, and the <em>Hostname</em> is assigned as a symbolic name to " "the requesting host. The optional <em>Lease time</em> can be used to set non-" "standard host-specific lease time, e.g. 12h, 3d or infinite." diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po index a17ac98e2..acc57792b 100644 --- a/modules/luci-base/po/sk/base.po +++ b/modules/luci-base/po/sk/base.po @@ -965,6 +965,11 @@ msgstr "" msgid "Enable" msgstr "" +msgid "" +"Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> " +"snooping" +msgstr "" + msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgstr "" @@ -1022,6 +1027,9 @@ msgstr "" msgid "Enabled" msgstr "" +msgid "Enables IGMP snooping on this bridge" +msgstr "" + msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" @@ -3409,7 +3417,7 @@ msgstr "" msgid "" "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</" -"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed " +"em> identifies the host, the <em>IPv4-Address</em> specifies the fixed " "address to use, and the <em>Hostname</em> is assigned as a symbolic name to " "the requesting host. The optional <em>Lease time</em> can be used to set non-" "standard host-specific lease time, e.g. 12h, 3d or infinite." diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po index 089546a37..632ea6f74 100644 --- a/modules/luci-base/po/sv/base.po +++ b/modules/luci-base/po/sv/base.po @@ -985,6 +985,11 @@ msgstr "Nödsituation" msgid "Enable" msgstr "Aktivera" +msgid "" +"Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> " +"snooping" +msgstr "" + msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgstr "Aktivera <abbr title=\"Spanning Tree Protocol\">STP</abbr>" @@ -1042,6 +1047,9 @@ msgstr "Aktivera/Inaktivera" msgid "Enabled" msgstr "Aktiverad" +msgid "Enables IGMP snooping on this bridge" +msgstr "" + msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" @@ -3436,7 +3444,7 @@ msgstr "" msgid "" "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</" -"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed " +"em> identifies the host, the <em>IPv4-Address</em> specifies the fixed " "address to use, and the <em>Hostname</em> is assigned as a symbolic name to " "the requesting host. The optional <em>Lease time</em> can be used to set non-" "standard host-specific lease time, e.g. 12h, 3d or infinite." diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot index de8b7fb22..ddf2e56fa 100644 --- a/modules/luci-base/po/templates/base.pot +++ b/modules/luci-base/po/templates/base.pot @@ -958,6 +958,11 @@ msgstr "" msgid "Enable" msgstr "" +msgid "" +"Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> " +"snooping" +msgstr "" + msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgstr "" @@ -1015,6 +1020,9 @@ msgstr "" msgid "Enabled" msgstr "" +msgid "Enables IGMP snooping on this bridge" +msgstr "" + msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" @@ -3402,7 +3410,7 @@ msgstr "" msgid "" "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</" -"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed " +"em> identifies the host, the <em>IPv4-Address</em> specifies the fixed " "address to use, and the <em>Hostname</em> is assigned as a symbolic name to " "the requesting host. The optional <em>Lease time</em> can be used to set non-" "standard host-specific lease time, e.g. 12h, 3d or infinite." diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po index 45f4a7c34..953d1e966 100644 --- a/modules/luci-base/po/tr/base.po +++ b/modules/luci-base/po/tr/base.po @@ -978,6 +978,11 @@ msgstr "" msgid "Enable" msgstr "" +msgid "" +"Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> " +"snooping" +msgstr "" + msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgstr "" @@ -1035,6 +1040,9 @@ msgstr "" msgid "Enabled" msgstr "" +msgid "Enables IGMP snooping on this bridge" +msgstr "" + msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" @@ -3422,7 +3430,7 @@ msgstr "" msgid "" "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</" -"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed " +"em> identifies the host, the <em>IPv4-Address</em> specifies the fixed " "address to use, and the <em>Hostname</em> is assigned as a symbolic name to " "the requesting host. The optional <em>Lease time</em> can be used to set non-" "standard host-specific lease time, e.g. 12h, 3d or infinite." diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po index b1feed3d1..8ead61607 100644 --- a/modules/luci-base/po/uk/base.po +++ b/modules/luci-base/po/uk/base.po @@ -1039,6 +1039,11 @@ msgstr "Аварійний" msgid "Enable" msgstr "Увімкнути" +msgid "" +"Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> " +"snooping" +msgstr "" + msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgstr "Увімкнути <abbr title=\"Spanning Tree Protocol\">STP</abbr>" @@ -1096,6 +1101,9 @@ msgstr "Увімкнено/Вимкнено" msgid "Enabled" msgstr "Увімкнено" +msgid "Enables IGMP snooping on this bridge" +msgstr "" + msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" @@ -3625,7 +3633,7 @@ msgstr "Використовувати таблицю маршрутизації msgid "" "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</" -"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed " +"em> identifies the host, the <em>IPv4-Address</em> specifies the fixed " "address to use, and the <em>Hostname</em> is assigned as a symbolic name to " "the requesting host. The optional <em>Lease time</em> can be used to set non-" "standard host-specific lease time, e.g. 12h, 3d or infinite." diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po index ecb369e13..888fc92bf 100644 --- a/modules/luci-base/po/vi/base.po +++ b/modules/luci-base/po/vi/base.po @@ -983,6 +983,11 @@ msgstr "" msgid "Enable" msgstr "" +msgid "" +"Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> " +"snooping" +msgstr "" + msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgstr "Kích hoạt <abbr title=\"Spanning Tree Protocol\">STP</abbr>" @@ -1040,6 +1045,9 @@ msgstr "Cho kích hoạt/ Vô hiệu hóa" msgid "Enabled" msgstr "" +msgid "Enables IGMP snooping on this bridge" +msgstr "" + msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" @@ -3464,7 +3472,7 @@ msgstr "" msgid "" "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</" -"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed " +"em> identifies the host, the <em>IPv4-Address</em> specifies the fixed " "address to use, and the <em>Hostname</em> is assigned as a symbolic name to " "the requesting host. The optional <em>Lease time</em> can be used to set non-" "standard host-specific lease time, e.g. 12h, 3d or infinite." diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po index c76511b99..df6ce8b74 100644 --- a/modules/luci-base/po/zh-cn/base.po +++ b/modules/luci-base/po/zh-cn/base.po @@ -993,6 +993,11 @@ msgstr "紧急" msgid "Enable" msgstr "启用" +msgid "" +"Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> " +"snooping" +msgstr "" + msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgstr "开启 <abbr title=\"Spanning Tree Protocol\">STP</abbr>" @@ -1050,6 +1055,9 @@ msgstr "启用/禁用" msgid "Enabled" msgstr "启用" +msgid "Enables IGMP snooping on this bridge" +msgstr "" + msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" @@ -3507,7 +3515,7 @@ msgstr "使用路由表" msgid "" "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</" -"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed " +"em> identifies the host, the <em>IPv4-Address</em> specifies the fixed " "address to use, and the <em>Hostname</em> is assigned as a symbolic name to " "the requesting host. The optional <em>Lease time</em> can be used to set non-" "standard host-specific lease time, e.g. 12h, 3d or infinite." diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po index 28a806e83..edc5207bd 100644 --- a/modules/luci-base/po/zh-tw/base.po +++ b/modules/luci-base/po/zh-tw/base.po @@ -995,6 +995,11 @@ msgstr "緊急" msgid "Enable" msgstr "啟用" +msgid "" +"Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> " +"snooping" +msgstr "" + msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgstr "啟用 <abbr title=\"Spanning Tree Protocol\">STP</abbr>" @@ -1052,6 +1057,9 @@ msgstr "啟用/關閉" msgid "Enabled" msgstr "啟用" +msgid "Enables IGMP snooping on this bridge" +msgstr "" + msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" @@ -3498,7 +3506,7 @@ msgstr "使用路由表" msgid "" "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</" -"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed " +"em> identifies the host, the <em>IPv4-Address</em> specifies the fixed " "address to use, and the <em>Hostname</em> is assigned as a symbolic name to " "the requesting host. The optional <em>Lease time</em> can be used to set non-" "standard host-specific lease time, e.g. 12h, 3d or infinite." diff --git a/modules/luci-base/root/etc/config/ucitrack b/modules/luci-base/root/etc/config/ucitrack index d08392295..1d4d110f2 100644 --- a/modules/luci-base/root/etc/config/ucitrack +++ b/modules/luci-base/root/etc/config/ucitrack @@ -36,6 +36,7 @@ config qos config system option init led + option exec '/etc/init.d/log reload' list affects luci_statistics list affects dhcp diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua b/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua index 5478afa3e..6fcd66f44 100644 --- a/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua +++ b/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua @@ -27,7 +27,8 @@ function index() entry({"admin", "system", "fstab", "swap"}, cbi("admin_system/fstab/swap"), nil).leaf = true end - if fs.access("/sys/class/leds") then + local nodes, number = fs.glob("/sys/class/leds/*") + if number > 0 then entry({"admin", "system", "leds"}, cbi("admin_system/leds"), _("<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"), 60) end @@ -195,7 +196,7 @@ local function supports_sysupgrade() end local function supports_reset() - return (os.execute([[grep -sqE '"rootfs_data"|"ubi"' /proc/mtd]]) == 0) + return (os.execute([[grep -sq "^overlayfs:/overlay / overlay " /proc/mounts]]) == 0) end local function storage_size() diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua index fbde431df..855ed31f1 100644 --- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua +++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua @@ -270,7 +270,7 @@ s = m:section(TypedSection, "host", translate("Static Leases"), "DHCP clients. They are also required for non-dynamic interface configurations where " .. "only hosts with a corresponding lease are served.") .. "<br />" .. translate("Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</em> " .. - "indentifies the host, the <em>IPv4-Address</em> specifies the fixed address to " .. + "identifies the host, the <em>IPv4-Address</em> specifies the fixed address to " .. "use, and the <em>Hostname</em> is assigned as a symbolic name to the requesting host. " .. "The optional <em>Lease time</em> can be used to set non-standard host-specific " .. "lease time, e.g. 12h, 3d or infinite.")) @@ -297,6 +297,11 @@ mac = s:option(Value, "mac", translate("<abbr title=\"Media Access Control\">MAC mac.datatype = "list(macaddr)" mac.rmempty = true +function mac.cfgvalue(self, section) + local val = Value.cfgvalue(self, section) + return ipc.checkmac(val) or val +end + ip = s:option(Value, "ip", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address")) ip.datatype = "or(ip4addr,'ignore')" diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua index 8e7a3b066..38e5de7b3 100644 --- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua +++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua @@ -272,6 +272,11 @@ if not net:is_virtual() then translate("Enables the Spanning Tree Protocol on this bridge")) stp:depends("type", "bridge") stp.rmempty = true + + igmp = s:taboption("physical", Flag, "igmp_snooping", translate("Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> snooping"), + translate("Enables IGMP snooping on this bridge")) + igmp:depends("type", "bridge") + igmp.rmempty = true end diff --git a/modules/luci-mod-freifunk/htdocs/luci-static/flashing.html b/modules/luci-mod-freifunk/htdocs/luci-static/flashing.html index 43e51236d..f9e882ff3 100644 --- a/modules/luci-mod-freifunk/htdocs/luci-static/flashing.html +++ b/modules/luci-mod-freifunk/htdocs/luci-static/flashing.html @@ -45,7 +45,7 @@ if( time_remaining <= 0 ) { window.clearInterval(interval); - location.href = 'http://' + location.hostname + '/'; + location.href = 'http://' + location.host + '/'; } else { diff --git a/modules/luci-mod-rpc/luasrc/controller/rpc.lua b/modules/luci-mod-rpc/luasrc/controller/rpc.lua index 3326d57a9..5df5e375a 100644 --- a/modules/luci-mod-rpc/luasrc/controller/rpc.lua +++ b/modules/luci-mod-rpc/luasrc/controller/rpc.lua @@ -2,18 +2,10 @@ -- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org> -- Licensed to the public under the Apache License 2.0. -local require = require -local pairs = pairs -local print = print -local pcall = pcall -local table = table -local type = type -local tonumber = tonumber +module("luci.controller.rpc", package.seeall) -module "luci.controller.rpc" - -local function session_retrieve(sid, allowed_users) +function session_retrieve(sid, allowed_users) local util = require "luci.util" local sdat = util.ubus("session", "get", { ubus_rpc_session = sid @@ -32,29 +24,34 @@ local function session_retrieve(sid, allowed_users) return nil end -local function authenticator(validator, accs) - local auth = luci.http.formvalue("auth", true) - or luci.http.getcookie("sysauth") +function authenticator(validator, accs) + local http = require "luci.http" + local ctrl = require "luci.controller.rpc" + local auth = http.formvalue("auth", true) or http.getcookie("sysauth") if auth then -- if authentication token was given - local sid, sdat = session_retrieve(auth, accs) + local sid, sdat = ctrl.session_retrieve(auth, accs) if sdat then -- if given token is valid return sdat.username, sid end - luci.http.status(403, "Forbidden") + http.status(403, "Forbidden") end end + function index() + local ctrl = require "luci.controller.rpc" + local rpc = node("rpc") rpc.sysauth = "root" - rpc.sysauth_authenticator = authenticator + rpc.sysauth_authenticator = ctrl.authenticator rpc.notemplate = true entry({"rpc", "uci"}, call("rpc_uci")) entry({"rpc", "fs"}, call("rpc_fs")) entry({"rpc", "sys"}, call("rpc_sys")) entry({"rpc", "ipkg"}, call("rpc_ipkg")) + entry({"rpc", "ip"}, call("rpc_ip")) entry({"rpc", "auth"}, call("rpc_auth")).sysauth = false end @@ -85,7 +82,7 @@ function rpc_auth() } }) - local sid, sdat = session_retrieve(login.ubus_rpc_session, { user }) + local sid, sdat = ctrl.session_retrieve(login.ubus_rpc_session, { user }) if sdat then return { sid = sid, @@ -168,13 +165,40 @@ function rpc_fs() end function rpc_sys() + local util = require "luci.util" local sys = require "luci.sys" local jsonrpc = require "luci.jsonrpc" local http = require "luci.http" local ltn12 = require "luci.ltn12" + local sys2 = util.clone(sys) + sys2.net = util.clone(sys.net) + sys2.wifi = util.clone(sys.wifi) + + function sys2.wifi.getiwinfo(ifname, operation) + local iw = sys.wifi.getiwinfo(ifname) + if iw then + if operation then + assert(type(iwinfo[iw.type][operation]) == "function") + return iw[operation] + end + + local n, f + local rv = { ifname = ifname } + for n, f in pairs(iwinfo[iw.type]) do + if type(f) == "function" and + n ~= "scanlist" and n ~= "countrylist" + then + rv[n] = iw[n] + end + end + return rv + end + return nil + end + http.prepare_content("application/json") - ltn12.pump.all(jsonrpc.handle(sys, http.source()), http.write) + ltn12.pump.all(jsonrpc.handle(sys2, http.source()), http.write) end function rpc_ipkg() @@ -190,3 +214,34 @@ function rpc_ipkg() http.prepare_content("application/json") ltn12.pump.all(jsonrpc.handle(ipkg, http.source()), http.write) end + +function rpc_ip() + if not pcall(require, "luci.ip") then + luci.http.status(404, "Not Found") + return nil + end + + local util = require "luci.util" + local ip = require "luci.ip" + local jsonrpc = require "luci.jsonrpc" + local http = require "luci.http" + local ltn12 = require "luci.ltn12" + + local ip2 = util.clone(ip) + + local _, n + for _, n in ipairs({ "new", "IPv4", "IPv6", "MAC" }) do + ip2[n] = function(address, netmask, operation, argument) + local cidr = ip[n](address, netmask) + if cidr and operation then + assert(type(cidr[operation]) == "function") + local cidr2 = cidr[operation](cidr, argument) + return (type(cidr2) == "userdata") and cidr2:string() or cidr2 + end + return (type(cidr) == "userdata") and cidr:string() or cidr + end + end + + http.prepare_content("application/json") + ltn12.pump.all(jsonrpc.handle(ip2, http.source()), http.write) +end diff --git a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua index 506170c2d..604f019ee 100644 --- a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua +++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua @@ -18,13 +18,13 @@ password = section:taboption("general", Value, "password", translate("PAP/CHAP p password.password = true if luci.model.network:has_ipv6() then - - ipv6 = section:taboption("advanced", ListValue, "ipv6") - ipv6:value("auto", translate("Automatic")) - ipv6:value("0", translate("Disabled")) - ipv6:value("1", translate("Manual")) - ipv6.default = "auto" - + ipv6 = section:taboption("advanced", ListValue, "ipv6", + translate("Obtain IPv6-Address"), + translate("Enable IPv6 negotiation on the PPP link")) + ipv6:value("auto", translate("Automatic")) + ipv6:value("0", translate("Disabled")) + ipv6:value("1", translate("Manual")) + ipv6.default = "auto" end defaultroute = section:taboption("advanced", Flag, "defaultroute", diff --git a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua index b14db5966..355d9b5b3 100644 --- a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua +++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua @@ -30,13 +30,13 @@ password.password = true if luci.model.network:has_ipv6() then - - ipv6 = section:taboption("advanced", ListValue, "ipv6") - ipv6:value("auto", translate("Automatic")) - ipv6:value("0", translate("Disabled")) - ipv6:value("1", translate("Manual")) - ipv6.default = "auto" - + ipv6 = section:taboption("advanced", ListValue, "ipv6", + translate("Obtain IPv6-Address"), + translate("Enable IPv6 negotiation on the PPP link")) + ipv6:value("auto", translate("Automatic")) + ipv6:value("0", translate("Disabled")) + ipv6:value("1", translate("Manual")) + ipv6.default = "auto" end diff --git a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua index 8f463e5d7..a5f76a38a 100644 --- a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua +++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua @@ -36,13 +36,13 @@ password.password = true if luci.model.network:has_ipv6() then - - ipv6 = section:taboption("advanced", ListValue, "ipv6") - ipv6:value("auto", translate("Automatic")) - ipv6:value("0", translate("Disabled")) - ipv6:value("1", translate("Manual")) - ipv6.default = "auto" - + ipv6 = section:taboption("advanced", ListValue, "ipv6", + translate("Obtain IPv6-Address"), + translate("Enable IPv6 negotiation on the PPP link")) + ipv6:value("auto", translate("Automatic")) + ipv6:value("0", translate("Disabled")) + ipv6:value("1", translate("Manual")) + ipv6.default = "auto" end diff --git a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua index 5a05cd206..d844c01db 100644 --- a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua +++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua @@ -30,13 +30,13 @@ service.placeholder = translate("auto") if luci.model.network:has_ipv6() then - - ipv6 = section:taboption("advanced", ListValue, "ipv6") - ipv6:value("auto", translate("Automatic")) - ipv6:value("0", translate("Disabled")) - ipv6:value("1", translate("Manual")) - ipv6.default = "auto" - + ipv6 = section:taboption("advanced", ListValue, "ipv6", + translate("Obtain IPv6-Address"), + translate("Enable IPv6 negotiation on the PPP link")) + ipv6:value("auto", translate("Automatic")) + ipv6:value("0", translate("Disabled")) + ipv6:value("1", translate("Manual")) + ipv6.default = "auto" end |