From 97ce1ad8adf935e2aa0d1b13f07b16d2d950053f Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Sun, 17 Aug 2008 18:32:53 +0000 Subject: [PATCH] Preparing rewrite of WiFi configuration --- contrib/package/luci-addons/dist/etc/crontabs/root | 6 +- i18n/english/luasrc/i18n/admin-core.en.lua | 11 ++- i18n/german/luasrc/i18n/admin-core.de.lua | 9 ++- libs/cbi/htdocs/luci-static/resources/cbi.js | 86 ++++++++++++---------- libs/cbi/luasrc/cbi.lua | 16 +++- libs/cbi/luasrc/view/cbi/cell_valuefooter.htm | 10 ++- libs/cbi/luasrc/view/cbi/footer.htm | 2 +- libs/cbi/luasrc/view/cbi/full_valuefooter.htm | 10 ++- libs/cbi/luasrc/view/cbi/lvalue.htm | 2 +- libs/cbi/luasrc/view/cbi/ucisection.htm | 13 +++- .../luasrc/model/cbi/admin_wifi/devices.lua | 13 +--- .../luasrc/model/cbi/admin_wifi/networks.lua | 74 +++++++++++++++---- 12 files changed, 173 insertions(+), 79 deletions(-) diff --git a/contrib/package/luci-addons/dist/etc/crontabs/root b/contrib/package/luci-addons/dist/etc/crontabs/root index 6e2e417dc..1169c5c6d 100644 --- a/contrib/package/luci-addons/dist/etc/crontabs/root +++ b/contrib/package/luci-addons/dist/etc/crontabs/root @@ -1,3 +1,3 @@ -0-59/1 * * * * /usr/bin/run-parts /etc/cron.minutely -0 * * * * /usr/bin/run-parts /etc/cron.hourly -0 0 * * * /usr/bin/run-parts /etc/cron.daily +* * * * * /usr/bin/run-parts /etc/cron.minutely +17 * * * * /usr/bin/run-parts /etc/cron.hourly +25 6 * * * /usr/bin/run-parts /etc/cron.daily diff --git a/i18n/english/luasrc/i18n/admin-core.en.lua b/i18n/english/luasrc/i18n/admin-core.en.lua index ed69e0110..4a47e4f1d 100644 --- a/i18n/english/luasrc/i18n/admin-core.en.lua +++ b/i18n/english/luasrc/i18n/admin-core.en.lua @@ -278,4 +278,13 @@ mem_buffered = "buffered" mem_free = "free" a_s_crontab = "Scheduled Tasks" -a_s_crontab1 = "This is the system crontab in which scheduled tasks can be defined." \ No newline at end of file +a_s_crontab1 = "This is the system crontab in which scheduled tasks can be defined." + +a_w_nasid = "NAS ID" +a_w_cacert = "Path to CA-Certificate" +a_w_eaptype = "EAP-Method" +a_w_tlsprivkey = "Path to Private Key" +a_w_tlsprivkeypwd = "Password of Private Key" +a_w_peapauth = "PEAP-Authentication" +a_w_peapidentity = "PEAP-Identity" +a_w_peappassword = "PEAP-Password" \ No newline at end of file diff --git a/i18n/german/luasrc/i18n/admin-core.de.lua b/i18n/german/luasrc/i18n/admin-core.de.lua index 2fcb8fbbc..c71dfc1de 100644 --- a/i18n/german/luasrc/i18n/admin-core.de.lua +++ b/i18n/german/luasrc/i18n/admin-core.de.lua @@ -355,4 +355,11 @@ mem_free = "frei" a_s_crontab = "Geplante Aufgaben" a_s_crontab1 = "Dies ist die System-Crontab in der geplante Aufgaben definiert werden können." -a_w_nasid = "NAS ID" \ No newline at end of file +a_w_nasid = "NAS ID" +a_w_cacert = "Pfad zum CA-Zertifikat" +a_w_eaptype = "EAP-Methode" +a_w_tlsprivkey = "Pfad zum Privaten Schlüssel" +a_w_tlsprivkeypwd = "Passwort des Privaten Schlüssels" +a_w_peapauth = "PEAP-Authentifizierung" +a_w_peapidentity = "PEAP-Identitäz" +a_w_peappassword = "PEAP-Passwort" \ No newline at end of file diff --git a/libs/cbi/htdocs/luci-static/resources/cbi.js b/libs/cbi/htdocs/luci-static/resources/cbi.js index 78a9e90bf..d0e31e483 100644 --- a/libs/cbi/htdocs/luci-static/resources/cbi.js +++ b/libs/cbi/htdocs/luci-static/resources/cbi.js @@ -1,38 +1,30 @@ -var cbi_d = {}; +var cbi_d = []; -function cbi_d_add(field, target, value) { - if (!cbi_d[target]) { - cbi_d[target] = {}; - } - if (!cbi_d[target][value]) { - cbi_d[target][value] = []; - } - +function cbi_d_add(field, dep) { var obj = document.getElementById(field); if (obj) { - var entry = { - "node": obj, - "parent": obj.parentNode, - "next": obj.nextSibling - } - cbi_d[target][value].unshift(entry); - } -} - -function cbi_d_update(target) { - if (!cbi_d[target]) { - return; - } - - for (var x in cbi_d[target]) { - for (var i=0; i 0 then -%> <%- end %> diff --git a/libs/cbi/luasrc/view/cbi/footer.htm b/libs/cbi/luasrc/view/cbi/footer.htm index b71905820..a688fcddd 100644 --- a/libs/cbi/luasrc/view/cbi/footer.htm +++ b/libs/cbi/luasrc/view/cbi/footer.htm @@ -17,7 +17,7 @@ $Id$ - + <%+footer%> diff --git a/libs/cbi/luasrc/view/cbi/full_valuefooter.htm b/libs/cbi/luasrc/view/cbi/full_valuefooter.htm index 5a52898d1..8084cfda9 100644 --- a/libs/cbi/luasrc/view/cbi/full_valuefooter.htm +++ b/libs/cbi/luasrc/view/cbi/full_valuefooter.htm @@ -34,7 +34,15 @@ $Id$ <% if #self.deps > 0 then -%> <%- end %> diff --git a/libs/cbi/luasrc/view/cbi/lvalue.htm b/libs/cbi/luasrc/view/cbi/lvalue.htm index 5108e85c4..60dd68280 100644 --- a/libs/cbi/luasrc/view/cbi/lvalue.htm +++ b/libs/cbi/luasrc/view/cbi/lvalue.htm @@ -16,7 +16,7 @@ $Id$ <% if self.widget == "select" then %> <% elseif self.widget == "radio" then diff --git a/libs/cbi/luasrc/view/cbi/ucisection.htm b/libs/cbi/luasrc/view/cbi/ucisection.htm index 2ae856003..f8cf3d1bc 100644 --- a/libs/cbi/luasrc/view/cbi/ucisection.htm +++ b/libs/cbi/luasrc/view/cbi/ucisection.htm @@ -27,8 +27,17 @@ $Id$ <%- end %> <% end %> diff --git a/modules/admin-full/luasrc/model/cbi/admin_wifi/devices.lua b/modules/admin-full/luasrc/model/cbi/admin_wifi/devices.lua index de2261919..e33f24161 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_wifi/devices.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_wifi/devices.lua @@ -25,18 +25,7 @@ function en.cfgvalue(self, section) return Flag.cfgvalue(self, section) or "0" end -t = s:option(ListValue, "type", translate("type")) -t:value("broadcom") -t:value("atheros") -t:value("mac80211") -t:value("prism2") ---[[ -require("luci.sys") -local c = ". /etc/functions.sh;for i in /lib/wifi/*;do . $i;done;echo $DRIVERS" -for driver in luci.util.execl(c)[1]:gmatch("[^ ]+") do - t:value(driver) -end -]]-- +t = s:option(DummyValue, "type", translate("type")) mode = s:option(ListValue, "mode", translate("mode")) mode:value("", "standard") diff --git a/modules/admin-full/luasrc/model/cbi/admin_wifi/networks.lua b/modules/admin-full/luasrc/model/cbi/admin_wifi/networks.lua index 0c62b58e9..a109587d9 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_wifi/networks.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_wifi/networks.lua @@ -49,29 +49,71 @@ s:option(Flag, "bursting", translate("a_w_athburst")).optional = true encr = s:option(ListValue, "encryption", translate("encryption")) encr:value("none", "keine") encr:value("wep", "WEP") -encr:value("psk", "WPA-PSK") -encr:value("wpa", "WPA-Radius") -encr:value("psk2", "WPA2-PSK") -encr:value("wpa2", "WPA2-Radius") - -key = s:option(Value, "key", translate("key")) -key:depends("encryption", "wep") -key:depends("encryption", "psk") -key:depends("encryption", "wpa") -key:depends("encryption", "psk2") -key:depends("encryption", "wpa2") -key.rmempty = true +encr:value("PSK", "WPA-PSK") +encr:value("WPA", "WPA-EAP", {mode="ap"}, {mode="sta"}) +encr:value("PSK2", "WPA2-PSK") +encr:value("WPA2", "WPA2-EAP", {mode="ap"}, {mode="sta"}) +encr:depends("mode", "ap") +encr:depends("mode", "sta") +encr:depends("mode", "wds") server = s:option(Value, "server", translate("a_w_radiussrv")) -server:depends("encryption", "wpa") -server:depends("encryption", "wpa2") +server:depends({mode="ap", encryption="WPA"}) +server:depends({mode="ap", encryption="WPA2"}) server.rmempty = true port = s:option(Value, "port", translate("a_w_radiusport")) -port:depends("encryption", "wpa") -port:depends("encryption", "wpa2") +port:depends({mode="ap", encryption="WPA"}) +port:depends({mode="ap", encryption="WPA2"}) port.rmempty = true +key = s:option(Value, "key", translate("key")) +key:depends("encryption", "wep") +key:depends("encryption", "PSK") +key:depends({mode="ap", encryption="WPA"}) +key:depends("encryption", "PSK2") +key:depends({mode="ap", encryption="WPA2"}) +key.rmempty = true + +nasid = s:option(Value, "nasid", translate("a_w_nasid")) +nasid:depends({mode="ap", encryption="WPA"}) +nasid:depends({mode="ap", encryption="WPA2"}) +nasid.rmempty = true + +eaptype = s:option(ListValue, "eap_type", translate("a_w_eaptype")) +eaptype:value("TLS") +eaptype:value("PEAP") +eaptype:depends({mode="sta", encryption="WPA"}) +eaptype:depends({mode="sta", encryption="WPA2"}) + +cacert = s:option(Value, "ca_cert", translate("a_w_cacert")) +cacert:depends({mode="sta", encryption="WPA"}) +cacert:depends({mode="sta", encryption="WPA2"}) + +privkey = s:option(Value, "priv_key", translate("a_w_tlsprivkey")) +privkey:depends({mode="sta", eap_type="TLS", encryption="WPA2"}) +privkey:depends({mode="sta", eap_type="TLS", encryption="WPA"}) + +privkeypwd = s:option(Value, "priv_key_pwd", translate("a_w_tlsprivkeypwd")) +privkeypwd:depends({mode="sta", eap_type="TLS", encryption="WPA2"}) +privkeypwd:depends({mode="sta", eap_type="TLS", encryption="WPA"}) + + +auth = s:option(Value, "auth", translate("a_w_peapauth")) +auth:depends({mode="sta", eap_type="PEAP", encryption="WPA2"}) +auth:depends({mode="sta", eap_type="PEAP", encryption="WPA"}) + +identity = s:option(Value, "identity", translate("a_w_peapidentity")) +identity:depends({mode="sta", eap_type="PEAP", encryption="WPA2"}) +identity:depends({mode="sta", eap_type="PEAP", encryption="WPA"}) + +password = s:option(Value, "password", translate("a_w_peappassword")) +password:depends({mode="sta", eap_type="PEAP", encryption="WPA2"}) +password:depends({mode="sta", eap_type="PEAP", encryption="WPA"}) + + + + s:option(Flag, "isolate", translate("a_w_apisolation"), translate("a_w_apisolation1")).optional = true s:option(Flag, "hidden", translate("a_w_hideessid")).optional = true -- 2.11.0