diff options
author | Ted Trask <ttrask01@yahoo.com> | 2008-09-12 12:43:06 +0000 |
---|---|---|
committer | Ted Trask <ttrask01@yahoo.com> | 2008-09-12 12:43:06 +0000 |
commit | ef97031547287d3d429cbd0c290d23ecfb555141 (patch) | |
tree | 8ea752e4f46d7e1b4fb0d2e8b4cf5921d94c256c | |
parent | 2764edeac9b4b54096f7a3c5eaa5b202e0c32f01 (diff) | |
download | acf-dansguardian-ef97031547287d3d429cbd0c290d23ecfb555141.tar.bz2 acf-dansguardian-ef97031547287d3d429cbd0c290d23ecfb555141.tar.xz |
Modified dansguardian to work despite missing config files.
git-svn-id: svn://svn.alpinelinux.org/acf/dansguardian/trunk@1466 ab2d0c66-481e-0410-8bed-d214d4d58bed
-rw-r--r-- | dansguardian-model.lua | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/dansguardian-model.lua b/dansguardian-model.lua index f24748e..f8fba15 100644 --- a/dansguardian-model.lua +++ b/dansguardian-model.lua @@ -117,13 +117,14 @@ update_general_config = function( config ) if success then local a,b,c - local text = fs.read_file(dansguardiancfg) + local text = fs.read_file(dansguardiancfg) or "" a,b,c,text = getopts.setoptsinfile(text, "", "filterip", config.value.filterip.value) a,b,c,text = getopts.setoptsinfile(text, "", "filterport", config.value.filterport.value) a,b,c,text = getopts.setoptsinfile(text, "", "proxyip", config.value.proxyip.value) a,b,c,text = getopts.setoptsinfile(text, "", "proxyport", config.value.proxyport.value) a,b,c,text = getopts.setoptsinfile(text, "", "accessdeniedaddress", "'"..config.value.accessdeniedaddress.value.."'") fs.write_file(dansguardiancfg, string.gsub(text, "\n+$", "")) + if not fs.is_file(dansguardiancfg2) then fs.create_file(dansguardiancfg2) end getopts.setoptsinfile(dansguardiancfg2, "", "naughtynesslimit", config.value.naughtynesslimit.value) else config.errtxt = "Failed to set config" @@ -170,12 +171,10 @@ end list_config_files = function() local list = {} - local details = fs.stat(dansguardiancfg) - details.filename = dansguardiancfg - list[1] = details - details = fs.stat(dansguardiancfg2) - details.filename = dansguardiancfg2 - list[2] = details + local details = fs.stat(dansguardiancfg) or {} + list[1] = { filename=dansguardiancfg, size = details.size or 0, mtime = details.mtime or "---" } + details = fs.stat(dansguardiancfg2) or {} + list[2] = { filename=dansguardiancfg2, size = details.size or 0, mtime = details.mtime or "---" } return cfe({ type="list", value=list, label="List of Dansguardian config files" }) end |