summaryrefslogtreecommitdiffhomepage
path: root/src/ffluci/config.lua
diff options
context:
space:
mode:
Diffstat (limited to 'src/ffluci/config.lua')
-rw-r--r--src/ffluci/config.lua20
1 files changed, 15 insertions, 5 deletions
diff --git a/src/ffluci/config.lua b/src/ffluci/config.lua
index f63dc1fad5..8b94db8089 100644
--- a/src/ffluci/config.lua
+++ b/src/ffluci/config.lua
@@ -2,10 +2,8 @@
FFLuCI - Configuration
Description:
-Some FFLuCI configuration values
+Some FFLuCI configuration values read from uci file "luci"
-ToDo:
-Port over to UCI
FileId:
$Id$
@@ -28,10 +26,22 @@ limitations under the License.
]]--
module("ffluci.config", package.seeall)
+require("ffluci.model.uci")
+require("ffluci.util")
+
+-- Warning! This is only for fallback and compatibility purporses! --
+main = {}
-- This is where stylesheets and images go
-mediaurlbase = "/ffluci/media"
+main.mediaurlbase = "/ffluci/media"
-- Does anybody think about browser autodetect here?
-- Too bad busybox doesn't populate HTTP_ACCEPT_LANGUAGE
-lang = "de" \ No newline at end of file
+main.lang = "de"
+
+
+-- Now overwrite with UCI values
+local ucidata = ffluci.model.uci.show("luci")
+if ucidata and ucidata.luci then
+ ffluci.util.update(ffluci.config, ucidata.luci)
+end \ No newline at end of file