diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/contrib/uci/freifunk | 16 | ||||
| -rw-r--r-- | core/contrib/uci/luci | 21 | ||||
| -rw-r--r-- | core/src/ffluci/template.lua | 2 | ||||
| -rw-r--r-- | core/src/ffluci/view/cbi/dvalue.htm | 2 | ||||
| -rw-r--r-- | core/src/ffluci/view/cbi/value.htm | 2 |
5 files changed, 25 insertions, 18 deletions
diff --git a/core/contrib/uci/freifunk b/core/contrib/uci/freifunk new file mode 100644 index 000000000..128267d04 --- /dev/null +++ b/core/contrib/uci/freifunk @@ -0,0 +1,16 @@ +config public contact + option nickname + option name + option mail + option phone + option location + option geo + option note + +config public community + option name "Freifunk Halle" + option homepage http://halle.freifunk.net + option essid halle.freifunk.net + option bssid 02:CA:FF:EE:BA:BE + option realm netz.freifunk-halle.net + option pool 104.62.0.0/16
\ No newline at end of file diff --git a/core/contrib/uci/luci b/core/contrib/uci/luci index e54d74717..7cc08215a 100644 --- a/core/contrib/uci/luci +++ b/core/contrib/uci/luci @@ -6,22 +6,13 @@ config core category_privileges option public nobody:nogroup config extern flash_keep - option uci "/etc/config" + option uci "/etc/config" option dropbear "/etc/dropbear" - option openvpn "/etc/openvpn" - option passwd "/etc/passwd" - option ipkg "/etc/ipkg.conf" - option httpd "/etc/httpd.conf" - option firewall "/etc/firewall.user" - -config public contact - option nickname - option name - option mail - option phone - option location - option geo - option note + option openvpn "/etc/openvpn" + option passwd "/etc/passwd" + option ipkg "/etc/ipkg.conf" + option httpd "/etc/httpd.conf" + option firewall "/etc/firewall.user" config event uci_oncommit option network "/etc/init.d/network restart" diff --git a/core/src/ffluci/template.lua b/core/src/ffluci/template.lua index 502013684..797e9d127 100644 --- a/core/src/ffluci/template.lua +++ b/core/src/ffluci/template.lua @@ -95,7 +95,7 @@ function compile(template) local r_include = "')\ninclude('%s')\nwrite('" local r_i18n = "'..translate('%1','%2')..'" local r_uci = "'..config('%1','%2','%3')..'" - local r_pexec = "'..%s..'" + local r_pexec = "'..(%s or '')..'" local r_exec = "')\n%s\nwrite('" -- Parse the expressions diff --git a/core/src/ffluci/view/cbi/dvalue.htm b/core/src/ffluci/view/cbi/dvalue.htm index 178f2e16a..f54667def 100644 --- a/core/src/ffluci/view/cbi/dvalue.htm +++ b/core/src/ffluci/view/cbi/dvalue.htm @@ -6,7 +6,7 @@ <%=self.value%> <% end else %> - <%=(self:cfgvalue(section) or "")%> + <%=self:cfgvalue(section)%> <% end %> <%+cbi/valuefooter%> diff --git a/core/src/ffluci/view/cbi/value.htm b/core/src/ffluci/view/cbi/value.htm index 61033a0f5..31bf38f77 100644 --- a/core/src/ffluci/view/cbi/value.htm +++ b/core/src/ffluci/view/cbi/value.htm @@ -1,3 +1,3 @@ <%+cbi/valueheader%> - <input type="text" onchange="cbi_d_update(this.id)" <% if self.size then %>size="<%=self.size%>" <% end %><% if self.maxlength then %>maxlength="<%=self.maxlength%>" <% end %>name="cbid.<%=self.config.."."..section.."."..self.option%>" id="cbid.<%=self.config.."."..section.."."..self.option%>" value="<%=(self:cfgvalue(section) or "")%>" /> + <input type="text" onchange="cbi_d_update(this.id)" <% if self.size then %>size="<%=self.size%>" <% end %><% if self.maxlength then %>maxlength="<%=self.maxlength%>" <% end %>name="cbid.<%=self.config.."."..section.."."..self.option%>" id="cbid.<%=self.config.."."..section.."."..self.option%>" value="<%=self:cfgvalue(section)%>" /> <%+cbi/valuefooter%> |