gluon-config-mode-domain-select: apply changes mentioned by neoraider

This commit is contained in:
kb-light 2018-02-04 21:31:33 +01:00
parent c5c0f7e5fd
commit 64ad28617e

View File

@ -1,17 +1,15 @@
return function(form, uci) return function(form, uci)
local site = require 'gluon.site'
local path = '/lib/gluon/domains'
local fs = require 'nixio.fs' local fs = require 'nixio.fs'
local json = require 'jsonc' local json = require 'jsonc'
local function get_domain_list() local function get_domain_list()
local list = {} local list = {}
for domain_path in fs.glob(path .. '/*.json') do for domain_path in fs.glob('/lib/gluon/domains/*.json') do
local domain_code = domain_path:match(path .. '/(.*)%.json$') local domain_code = domain_path:match('([^/]+)%.json$')
local domain = assert(json.load(domain_path)) local domain = assert(json.load(domain_path))
table.insert(list, { table.insert(list, {
domain_code = domain_code, domain_code = domain_code,
domain_name = (domain.domain_names or {})[domain_code], domain_name = domain.domain_names[domain_code],
hide_domain = domain.hide_domain or False, hide_domain = domain.hide_domain or False,
}) })
end end