diff options
Diffstat (limited to 'modules')
35 files changed, 349 insertions, 59 deletions
diff --git a/modules/luci-base/htdocs/luci-static/resources/xhr.js b/modules/luci-base/htdocs/luci-static/resources/xhr.js index 91dcf3fefe..de4476cdd3 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/view/cbi/footer.htm b/modules/luci-base/luasrc/view/cbi/footer.htm index 4d332fd07a..e6acfb0697 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 c413b7172d..b08344b404 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 89714cc818..aa4144758b 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 fd495b9507..574ddf184a 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 ad5ed07fb9..f746db32a4 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 f629135950..50a7c92815 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 776f7fb15c..8aed2e9ee3 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 9de1687204..e09343815d 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 8d5daf3890..cb4c74a3f6 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 5e2ea2b176..e49b5303f0 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 6b55e23e22..ce866d9e7b 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 b643e8cf5b..07eeec5ee3 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 04d3c6a23a..e4f77c78f5 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 b478bd623b..d5c889580b 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 502c3b38a8..1805d8e990 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 956e566e91..5e2fbaeee0 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 9c4901f3d4..a51d11d2a5 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 8f2622c26d..843a4cac86 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 86eaa6495d..748bfdbc53 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 4ffb7233c2..35a697620e 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 a17ac98e20..acc57792b3 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 089546a37d..632ea6f745 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 de8b7fb22c..ddf2e56faa 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 45f4a7c342..953d1e9669 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 b1feed3d18..8ead616074 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 ecb369e13e..888fc92bfe 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 c76511b991..df6ce8b746 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 28a806e839..edc5207bd9 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 d083922955..1d4d110f2a 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 5478afa3e6..6fcd66f441 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 fbde431df8..855ed31f10 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 8e7a3b0667..38e5de7b39 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 43e51236d7..f9e882ff30 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 3326d57a95..5df5e375a7 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 |