X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=applications%2Fluci-qos%2Fluasrc%2Fmodel%2Fcbi%2Fqos%2Fqosmini.lua;h=0c5766f342089869e2a3c188f4227beb7fa70699;hp=c775ece7309fa9245ea2396c7038ae6d3df3f733;hb=c82ac742b11fbeb9898e996870b93b224131efe1;hpb=12df938e98b2ceb9a6edd50f0cf4febb8aebd45f

diff --git a/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua b/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua
index c775ece73..0c5766f34 100644
--- a/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua
+++ b/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua
@@ -21,14 +21,19 @@ m = Map("qos")
 s = m:section(NamedSection, "wan", "interface", translate("Internet Connection"))
 
 s:option(Flag, "enabled", translate("Quality of Service"))
-s:option(Value, "download", translate("Downlink"), "kb/s")
-s:option(Value, "upload", translate("Uplink"), "kb/s")
+
+dl = s:option(Value, "download", translate("Downlink"), "kbit/s")
+dl.datatype = "and(uinteger,min(1))"
+
+ul = s:option(Value, "upload", translate("Uplink"), "kbit/s")
+ul.datatype = "and(uinteger,min(1))"
 
 s = m:section(TypedSection, "classify")
 s.template = "cbi/tblsection"
 
 s.anonymous = true
 s.addremove = true
+s.sortable  = true
 
 t = s:option(ListValue, "target")
 t:value("Priority", translate("priority"))
@@ -50,14 +55,20 @@ wa.cbi_add_knownips(dsth)
 l7 = s:option(ListValue, "layer7", translate("Service"))
 l7.rmempty = true
 l7:value("", translate("all"))
-local pats = fs.glob("/etc/l7-protocols/*/*.pat")
+
+local pats = io.popen("find /etc/l7-protocols/ -type f -name '*.pat'")
 if pats then
-	for f in pats do
-		f = f:match("([^/]+)%.pat$")
-		if f then
-			l7:value(f)
+	local l
+	while true do
+		l = pats:read("*l")
+		if not l then break end
+
+		l = l:match("([^/]+)%.pat$")
+		if l then
+			l7:value(l)
 		end
 	end
+	pats:close()
 end
 
 p = s:option(ListValue, "proto", translate("Protocol"))