Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* luci/libs: fix datatype validation of list values

Browse source
This commit is contained in:
Jo-Philipp Wich 2008-08-18 23:43:20 +00:00
parent 50a1f999ce
commit e5608ae6b2
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libs/uvl/luasrc/uvl.lua
View file

@ -305,12 +305,16 @@ function UVL._validate_option( self, option, nodeps )
if item.datatype and val then if item.datatype and val then
if self.datatypes[item.datatype] then if self.datatypes[item.datatype] then
if not self.datatypes[item.datatype]( val ) then val = ( type(val) == "table" and val or { val } )
return false, 'Value "' .. ( val or '<nil>' ) .. for i, v in ipairs(val) do
if not self.datatypes[item.datatype]( v ) then
return false, 'Value' .. ( #val>1 and ' #'..i or '' ) ..
' "' .. ( v or '<nil>' ) ..
'" of given option "' .. option:cid() .. '" of given option "' .. option:cid() ..
'" does not validate as datatype "' .. '" does not validate as datatype "' ..
item.datatype .. '"' item.datatype .. '"'
end end
end
else else
return false, 'Unknown datatype "' .. return false, 'Unknown datatype "' ..
item.datatype .. '" encountered' item.datatype .. '" encountered'