summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2008-10-03 12:42:13 +0000
committerTed Trask <ttrask01@yahoo.com>2008-10-03 12:42:13 +0000
commit45372396aa0f819f5304faee69874b6448576c89 (patch)
tree33fd768cc3c401b01ad7ebd78829d27cd8a356cf
parent06e38aae23a85a64ff3290417ecd74ff3d5fa849 (diff)
downloadacf-dansguardian-45372396aa0f819f5304faee69874b6448576c89.tar.bz2
acf-dansguardian-45372396aa0f819f5304faee69874b6448576c89.tar.xz
Modified format library. parse_configfile2, update_configfile2, get_section, and set_section became parse_ini_file, update_ini_file, get_ini_section, and set_ini_section. Updated all code that used these functions.
git-svn-id: svn://svn.alpinelinux.org/acf/dansguardian/trunk@1539 ab2d0c66-481e-0410-8bed-d214d4d58bed
-rw-r--r--dansguardian-model.lua16
1 files changed, 8 insertions, 8 deletions
diff --git a/dansguardian-model.lua b/dansguardian-model.lua
index 685ff67..66bd6a7 100644
--- a/dansguardian-model.lua
+++ b/dansguardian-model.lua
@@ -95,7 +95,7 @@ read_general_config = function()
naughtynesslimit = cfe({ label="NaughtynessLimit" })
}
- local config = format.parse_configfile2(fs.read_file(dansguardiancfg), "")
+ local config = format.parse_ini_file(fs.read_file(dansguardiancfg), "")
if config then
if config.filterip then retval.filterip.value = config.filterip end
if config.filterport then retval.filterport.value = config.filterport end
@@ -104,7 +104,7 @@ read_general_config = function()
if config.accessdeniedaddress then retval.accessdeniedaddress.value = string.sub(config.accessdeniedaddress, 2, -2) end
end
- config = format.parse_configfile2(fs.read_file(dansguardiancfg2), "")
+ config = format.parse_ini_file(fs.read_file(dansguardiancfg2), "")
if config then
if config.naughtynesslimit then retval.naughtynesslimit.value = config.naughtynesslimit end
end
@@ -118,15 +118,15 @@ update_general_config = function( config )
if success then
local text = fs.read_file(dansguardiancfg) or ""
- text = format.update_configfile2(text, "", "filterip", config.value.filterip.value)
- text = format.update_configfile2(text, "", "filterport", config.value.filterport.value)
- text = format.update_configfile2(text, "", "proxyip", config.value.proxyip.value)
- text = format.update_configfile2(text, "", "proxyport", config.value.proxyport.value)
- text = format.update_configfile2(text, "", "accessdeniedaddress", "'"..config.value.accessdeniedaddress.value.."'")
+ text = format.update_ini_file(text, "", "filterip", config.value.filterip.value)
+ text = format.update_ini_file(text, "", "filterport", config.value.filterport.value)
+ text = format.update_ini_file(text, "", "proxyip", config.value.proxyip.value)
+ text = format.update_ini_file(text, "", "proxyport", config.value.proxyport.value)
+ text = format.update_ini_file(text, "", "accessdeniedaddress", "'"..config.value.accessdeniedaddress.value.."'")
fs.write_file(dansguardiancfg, text)
text = fs.read_file(dansguardiancfg2) or ""
- text = format.update_configfile2(text, "", "naughtynesslimit", config.value.naughtynesslimit.value)
+ text = format.update_ini_file(text, "", "naughtynesslimit", config.value.naughtynesslimit.value)
fs.write_file(dansguardiancfg2, text)
else
config.errtxt = "Failed to set config"