diff options
| author | pmelange <isprotejesvalkata@gmail.com> | 2019-01-11 12:54:55 +0100 |
|---|---|---|
| committer | pmelange <isprotejesvalkata@gmail.com> | 2019-01-11 12:57:52 +0100 |
| commit | d4562ff54461cfb39320af22478e33a13f480fee (patch) | |
| tree | 22958558c7e524bf9a4b3032fa7c25e8db128273 /modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm | |
| parent | e3fa766b587a1f8574a0aa979b9e41d9770b38e5 (diff) | |
luci-mod-freifunk: replace calls to get_all() with separate get() calls
The get_all() function has changed and how it was used before no
longer works properly. These changes not only change to individual
get() calls, but actually adds to the readability of the code and reduces
file size.
Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
Diffstat (limited to 'modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm')
| -rw-r--r-- | modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm b/modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm index dca35376cb..dececeff51 100644 --- a/modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm +++ b/modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm @@ -9,22 +9,15 @@ <% local uci = require "luci.model.uci".cursor() -local contact = uci:get_all("freifunk", "contact") -local nickname, name, mail, phone, location, note -local lon = uci:get_first("system", "system", "longitude") -local lat = uci:get_first("system", "system", "latitude") - -if not contact then - nickname, name, homepage, mail, phone, location, note = "" -else - nickname = contact.nickname or "" - name = contact.name or "" - homepage = contact.homepage or {} - mail = contact.mail or "" - phone = contact.phone or "" - location = uci:get_first("system", "system", "location") or contact.location - note = contact.note or "" -end +local nickname = uci:get("freifunk", "contact", "nickname") or "" +local name = uci:get("freifunk", "contact", "name") or "" +local homepage = uci:get("freifunk", "contact", "homepage") or {} +local mail = uci:get("freifunk", "contact", "mail") or "" +local phone = uci:get("freifunk", "contact", "phone") or "" +local location = uci:get_first("system", "system", "locaton") or uci:get("freifunk", "contact", "location") or "" +local note = uci:get("freifunk", "contact", "note") or "" +local lon = uci:get_first("system", "system", "longitude") or "" +local lat = uci:get_first("system", "system", "latitude") or "" %> <h2 name="content"><%:Contact%></h2> |