diff options
| author | Steven Barth <steven@midlink.org> | 2008-04-27 22:57:29 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2008-04-27 22:57:29 +0000 |
| commit | 4700739186c0c4a4cc0cc5ba2ae5e421ee6c2a3f (patch) | |
| tree | a57f136d8dfddd2788d17448650deebc11b35ad2 /module | |
| parent | 17b357af81fef5f946c1df6e8966dc4158d4bdbc (diff) | |
* Minor bugfixes
Diffstat (limited to 'module')
| -rw-r--r-- | module/admin-core/src/controller/admin/uci.lua | 2 | ||||
| -rw-r--r-- | module/admin-core/src/model/cbi/admin_network/dhcp.lua | 4 | ||||
| -rw-r--r-- | module/public-core/src/view/public_index/contact.htm | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/module/admin-core/src/controller/admin/uci.lua b/module/admin-core/src/controller/admin/uci.lua index 1a3ae1279f..251107dfe7 100644 --- a/module/admin-core/src/controller/admin/uci.lua +++ b/module/admin-core/src/controller/admin/uci.lua @@ -25,7 +25,7 @@ function action_apply() if ffluci.config.uci_oncommit then for i, cmd in ipairs(apply) do if cmd then - output = output .. cmd .. ":" .. ffluci.sys.exec(cmd) + output = output .. cmd .. ":" .. ffluci.sys.exec(cmd) .. "\n" end end end diff --git a/module/admin-core/src/model/cbi/admin_network/dhcp.lua b/module/admin-core/src/model/cbi/admin_network/dhcp.lua index 0c37b89552..766d87da2f 100644 --- a/module/admin-core/src/model/cbi/admin_network/dhcp.lua +++ b/module/admin-core/src/model/cbi/admin_network/dhcp.lua @@ -18,7 +18,9 @@ end s:option(Value, "start", "Start", "Erste vergebene Adresse (letztes Oktett)").rmempty = true -s:option(Value, "limit", "Limit", "Letzte vergebene Adresse (letztes Oktett)").rmempty = true +s:option(Value, "limit", "Limit", "Anzahl zu vergebender Adressen -1").rmempty = true + +s:option(Value, "leasetime", "Laufzeit").rmempty = true s:option(Flag, "dynamicdhcp", "Dynamisches DHCP").rmempty = true diff --git a/module/public-core/src/view/public_index/contact.htm b/module/public-core/src/view/public_index/contact.htm index d19df7e4c0..df34812af9 100644 --- a/module/public-core/src/view/public_index/contact.htm +++ b/module/public-core/src/view/public_index/contact.htm @@ -1,5 +1,5 @@ <%+header%> -<% local contact = ffluci.model.uci.show("freifunk", "contact").freifunk.contact %> +<% local contact = ffluci.model.uci.show("freifunk").freifunk.contact %> <h1><%:contact Kontakt%></h1> <table cellspacing="0" cellpadding="6"> <tr><th><%:nickname Pseudonym%>:</th><td><%=contact.nickname%></td></tr> |