[x-wrt] r4825 committed - fix some functions and add others
codesite...@google.com
Author: fof...@gmail.com
Date: Mon Sep 7 06:03:02 2009
Log: fix some functions and add others
http://code.google.com/p/x-wrt/source/detail?r=4825
Modified:
/trunk/package/webif-iw-lua/files/usr/lib/lua/lua-xwrt/form.lua
/trunk/package/webif-iw-lua/files/usr/lib/lua/lua-xwrt/net.lua
/trunk/package/webif-iw-lua/files/usr/lib/lua/lua-xwrt/strform.lua
=======================================
--- /trunk/package/webif-iw-lua/files/usr/lib/lua/lua-xwrt/form.lua Mon Jan
19 15:45:38 2009
+++ /trunk/package/webif-iw-lua/files/usr/lib/lua/lua-xwrt/form.lua Mon
Sep 7 06:03:02 2009
@@ -51,6 +51,8 @@
if name ~= nil then
if self[name].input == "text" then
return self:text_box(self[name])
+ elseif self[name].input == "radio" then
+ return self:radio(self[name])
elseif self[name].input == "text_box" then
return self:text_box(self[name])
elseif self[name].input == "disabled_text" then
@@ -316,18 +318,19 @@
return str
end
-function formClass:radio(name,value,label,options,style,script)
- if label == nil then label = name end
- if value == nil then value = "" end
- if style == nil then style = "" end
- if string.trim(value) == string.trim(options) then options = "
checked=\"checked\"" end
- if script == nil then script = "" end
- local str = "<tr><td width=\"40%\">" .. label .. "</td>"
+function formClass:radio(t)
+-- if label == nil then label = name end
+-- if value == nil then value = "" end
+-- if style == nil then style = "" end
+--- if string.trim(value) == string.trim(options) then options = "
checked=\"checked\"" end
+-- if script == nil then script = "" end
+ local str = "<tr><td width=\"40%\">" .. t.label .. "</td>"
str = str .. "<td width=\"60%\">"
- str = str .. "<input type=\"hidden\" name=\"val_str_"..name.."\"
value=\"string\" />"
- str = str .. "<input type=\"hidden\" name=\"val_lbl_"..name.."\"
value=\""..label.."\" />"
- str = str .. "<input type=\"radio\" name=\""..name.."\"
style=\""..style.."\" "..script.." "..options.."/>"
- str = str .. "</td></tr>"
+-- str = str .. "<input type=\"hidden\" name=\"val_str_"..name.."\"
value=\"string\" />"
+-- str = str .. "<input type=\"hidden\" name=\"val_lbl_"..name.."\"
value=\""..label.."\" --/>"
+-- str = str .. "<input type=\"radio\" name=\""..name.."\"
style=\""..style.."\" "..script.." "..options.."/>"
+ str = str .. strform.radio(t)
+ str = str .. "</td></tr>"
return str
end
=======================================
--- /trunk/package/webif-iw-lua/files/usr/lib/lua/lua-xwrt/net.lua Thu Oct
16 14:02:05 2008
+++ /trunk/package/webif-iw-lua/files/usr/lib/lua/lua-xwrt/net.lua Mon Sep
7 06:03:02 2009
@@ -218,6 +218,7 @@
function dev_list()
local wirelessif =uci.get_type("wireless","wifi-iface")
local nets = {}
+ if wirelessif then
for i=1, #wirelessif do
local netname = wirelessif[i].device
local t = uci.get_section("network",wirelessif[i].network)
@@ -227,6 +228,7 @@
end
nets[netname] = wirelessif[i].device
end
+ end
local networks = uci.get_type("network","interface")
for i, t in pairs(networks) do
if networks[i].type == "bridge" then
=======================================
--- /trunk/package/webif-iw-lua/files/usr/lib/lua/lua-xwrt/strform.lua Mon
Sep 7 05:59:41 2009
+++ /trunk/package/webif-iw-lua/files/usr/lib/lua/lua-xwrt/strform.lua Mon
Sep 7 06:03:02 2009
@@ -31,13 +31,23 @@
end
end
-function set_checked (t)
- if t.checked == nil then t.checked = "1" end
- if string.trim(t.value) == string.trim(t.checked) then
- return " checked=\"checked\""
- else
- return ""
+function set_checked (t,op)
+ if (op ~= nil) then
+ if string.trim(op.value) == string.trim(t.value) then
+ if t.input == "radio" then
+ return " checked "
+ elseif t.input == "select" then
+ return " selected=\"selected\" "
+ end
+ end
end
+ if t.input == "checkbox" then
+ if t.checked == nil then t.checked = "1" end
+ if string.trim(t.value) == string.trim(t.checked) then
+ return " checked=\"checked\" "
+ end
+ end
+ return ""
end
function set_validate(t)
@@ -77,46 +87,43 @@
function radio (t)
set_values(t)
for v,op in ipairs(t.options) do
- str = str .. "<input type=\"radio\" name=\""..t.name.."\"
value=\""..op.value.."\" "..style.." "..script.." />"..op.label
+ checked = set_checked(t,op)
+ str = str .. "<input type=\"radio\" name=\""..t.name.."\"
value=\""..op.value.."\""..set_checked(t,op)..style.." "..script.."
/>"..op.label.."\n"
end
return str
end
function hidden (t)
set_values(t)
- str = str .. "<input type=\"hidden\" name=\""..t.name.."\"
value=\""..t.value.."\" />"
+ str = str .. "<input type=\"hidden\" name=\""..t.name.."\"
value=\""..t.value.."\" />\n"
return str
end
function disabled_text(t)
set_values(t)
- str = str .. "<input type=\"text\" name=\""..t.name.."\"
value=\""..t.value.."\" "..style.." "..script.." disabled=\"disabled\"/>"
+ str = str .. "<input type=\"text\" name=\""..t.name.."\"
value=\""..t.value.."\" "..style.." "..script.." disabled=\"disabled\"/>\n"
return str
end
function text_area(t)
set_values(t)
- str = str .. "<TEXTAREA name=\""..t.name.."\" rows=\"6\"
wrap=\"off\" "..style.." "..script.." >"..t.value.."</TEXTAREA>"
+ str = str .. "<TEXTAREA name=\""..t.name.."\" rows=\"6\"
wrap=\"off\" "..style.." "..script.." >"..t.value.."</TEXTAREA>\n"
return str
end
function password(t)
set_values(t)
- str = str .. "<input type=\"password\" name=\""..t.name.."\"
value=\""..t.value.."\" "..style.." "..script..">"
+ str = str .. "<input type=\"password\" name=\""..t.name.."\"
value=\""..t.value.."\" "..style.." "..script..">\n"
return str
end
function select(t)
set_values(t)
- str = str .. "<select name=\""..t.name.."\" "..style.." "..script..">"
+ str = str .. "<select name=\""..t.name.."\" "..style.." "..script..">\n"
for v,op in ipairs(t.options) do
- if string.trim(op.value) == string.trim(t.value) then
- str = str .. "<option value=\""..op.value.."\"
selected=\"selected\">"..op.label.."</option>"
- else
- str = str .. "<option value=\""..op.value.."\" >"..op.label.."</option>"
- end
+ str = str .. "\t<option
value=\""..op.value.."\""..set_checked(t,op)..">"..op.label.."</option>"
end
- str = str .. "</select>"
+ str = str .. "</select>\n"
return str
end