From be5b1015b2a3d87384ece96eba7d3c2a4a217fd4 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 29 Jan 2011 17:54:00 +0000
Subject: [PATCH] libs/web: improve cbi handling of Flag values, support usage
 of .default attribute to signalize default-on checkboxes, this helps to deal
 with the reversed logic of various uci bools within OpenWrt configs

---
 libs/web/luasrc/cbi.lua             | 23 +++++++++++++----------
 libs/web/luasrc/view/cbi/fvalue.htm |  3 +++
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/libs/web/luasrc/cbi.lua b/libs/web/luasrc/cbi.lua
index 8bb3488a7..5dd57e2e9 100644
--- a/libs/web/luasrc/cbi.lua
+++ b/libs/web/luasrc/cbi.lua
@@ -51,6 +51,7 @@ AUTO = true
 CREATE_PREFIX = "cbi.cts."
 REMOVE_PREFIX = "cbi.rts."
 RESORT_PREFIX = "cbi.sts."
+FEXIST_PREFIX = "cbi.cbe."
 
 -- Loads a CBI map from given file, creating an environment and returns it
 function load(cbimap, ...)
@@ -1481,29 +1482,31 @@ function Flag.__init__(self, ...)
 	AbstractValue.__init__(self, ...)
 	self.template  = "cbi/fvalue"
 
-	self.enabled = "1"
+	self.enabled  = "1"
 	self.disabled = "0"
+	self.default  = self.disabled
 end
 
 -- A flag can only have two states: set or unset
 function Flag.parse(self, section)
-	local fvalue = self:formvalue(section)
-
-	if fvalue then
-		fvalue = self.enabled
-	else
-		fvalue = self.disabled
-	end
+	local fexists = self.map:formvalue(
+		FEXIST_PREFIX .. self.config .. "." .. section .. "." .. self.option)
 
-	if fvalue == self.enabled or (not self.optional and not self.rmempty) then
-		if not(fvalue == self:cfgvalue(section)) then
+	if fexists then
+		local fvalue = self:formvalue(section) and self.enabled or self.disabled
+		if fvalue ~= self.default or (not self.optional and not self.rmempty) then
 			self:write(section, fvalue)
+		else
+			self:remove(section)
 		end
 	else
 		self:remove(section)
 	end
 end
 
+function Flag.cfgvalue(self, section)
+	return AbstractValue.cfgvalue(self, section) or self.default
+end
 
 
 --[[
diff --git a/libs/web/luasrc/view/cbi/fvalue.htm b/libs/web/luasrc/view/cbi/fvalue.htm
index 013c54e68..df96fe2c6 100644
--- a/libs/web/luasrc/view/cbi/fvalue.htm
+++ b/libs/web/luasrc/view/cbi/fvalue.htm
@@ -13,6 +13,9 @@ $Id$
 
 -%>
 <%+cbi/valueheader%>
+	<input type="hidden" value="1"<%=
+		attr("name", "cbi.cbe." .. self.config .. "." .. section .. "." .. self.option)
+	%> />
 	<input class="cbi-input-checkbox" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)" type="checkbox"<%=
 		attr("id", cbid) .. attr("name", cbid) .. attr("value", self.enabled or 1) ..
 		ifattr((self:cfgvalue(section) or self.default) == self.enabled, "checked", "checked")
-- 
2.25.1