Merge r4099 r4100 r4101

diff --git a/contrib/uci/Makefile b/contrib/uci/Makefile
index 14dc36759707520574f4ecae135d76d6310ae826..09f0cdf24df5cbb90ddd2c5eeaabe41a12cbb1b5 100644 (file)
--- a/contrib/uci/Makefile
+++ b/contrib/uci/Makefile
@@ -1,7 +1,7 @@
 include ../../build/config.mk
 include ../../build/gccconfig.mk
 
-UCI_VERSION  = 0.7.1
+UCI_VERSION  = 0.7.2
 UCI_SITE    = http://mirror2.openwrt.org/sources
 UCI_DIR     = uci-$(UCI_VERSION)
 UCI_FILE    = $(UCI_DIR).tar.gz

diff --git a/libs/cbi/luasrc/cbi.lua b/libs/cbi/luasrc/cbi.lua
index d24fa6ad03d1dc67471f90bc45e840983b55016e..275c3f3c361b8d7d19c2ee1c31f6fc5db28914e1 100644 (file)
--- a/libs/cbi/luasrc/cbi.lua
+++ b/libs/cbi/luasrc/cbi.lua
@@ -57,10 +57,10 @@ function load(cbimap, ...)
 
        local upldir = "/lib/uci/upload/"
        local cbidir = luci.util.libpath() .. "/model/cbi/"
-       
-       assert(luci.fs.stat(cbimap) or luci.fs.stat(cbidir..cbimap..".lua"), 
+
+       assert(luci.fs.stat(cbimap) or luci.fs.stat(cbidir..cbimap..".lua"),
         "Model not found!")
-         
+
        local func, err = loadfile(cbimap)
        if not func then
                func, err = loadfile(cbidir..cbimap..".lua")
@@ -298,9 +298,9 @@ function Map.__init__(self, config, ...)
 
        self.uci = uci.cursor()
        self.save = true
-       
+
        self.changed = false
-       
+
        if not self.uci:load(self.config) then
                error("Unable to read UCI data: " .. self.config)
        end
@@ -456,12 +456,12 @@ end
 
 function Compound.parse(self, ...)
        local cstate, state = 0, 0
-       
+
        for k, child in ipairs(self.children) do
                cstate = child:parse(...)
                state = (not state or cstate < state) and cstate or state
        end
-       
+
        return state
 end
 
@@ -479,13 +479,13 @@ end
 function Delegator.state(self, name, node, transitor)
        transitor = transitor or self.transistor_linear
        local state = {node=node, name=name, transitor=transitor}
-       
+
        assert(instanceof(node, Node), "Invalid node")
        assert(not self.nodes[name], "Duplicate entry")
-       
+
        self.nodes[name] = state
        self:append(state)
-       
+
        return state
 end
 
@@ -508,10 +508,10 @@ end
 function Delegator.parse(self, ...)
        local active = self:getactive()
        assert(active, "Invalid state")
-       
+
        local cstate = active.node:parse()
        self.active = active.transistor(self, active.node, cstate)
-       
+
        if not self.active then
                return FORM_DONE
        else
@@ -525,8 +525,8 @@ function Delegator.render(self, ...)
 end
 
 function Delegator.getactive(self)
-       return self:get(Map.formvalue(self, "cbi.delegated") 
-               or (self.children[1] and self.children[1].name)) 
+       return self:get(Map.formvalue(self, "cbi.delegated")
+               or (self.children[1] and self.children[1].name))
 end
 
 --[[
@@ -816,7 +816,7 @@ function Table.__init__(self, form, data, ...)
        local datasource = {}
        datasource.config = "table"
        self.data = data
-       
+
        datasource.formvalue = Map.formvalue
        datasource.formvaluetable = Map.formvaluetable
        datasource.readinput = true
@@ -824,7 +824,7 @@ function Table.__init__(self, form, data, ...)
        function datasource.get(self, section, option)
                return data[section] and data[section][option]
        end
-       
+
        function datasource.submitstate(self)
                return Map.formvalue(self, "cbi.submit")
        end
@@ -918,7 +918,7 @@ function NamedSection.parse(self, novld)
                        end
                end
                AbstractSection.parse_optionals(self, s)
-               
+
                if self.changed then
                        self:push_events()
                end
@@ -1186,7 +1186,7 @@ function AbstractValue.parse(self, section, novld)
                        if self:write(section, fvalue) then
                                -- Push events
                                self.section.changed = true
-                               --luci.util.append(self.map.events, self.events)                        
+                               --luci.util.append(self.map.events, self.events)
                        end
                end
        else                                                    -- Unset the UCI or error
@@ -1501,7 +1501,7 @@ function StaticList.validate(self, value)
 
        local valid = {}
        for i, v in ipairs(value) do
-               if luci.util.contains(self.vallist, v) then
+               if luci.util.contains(self.keylist, v) then
                        table.insert(valid, v)
                end
        end