From d7af70635c2c5d11061c60b7148ce11c2aecc318 Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Wed, 9 Dec 2009 11:54:00 +0000
Subject: Look in config files to find logfile paths. Bumped to 0.2.2

---
 Makefile                |  2 +-
 clamav-controller.lua   |  4 ++++
 clamav-expert-html.lsp  |  2 +-
 clamav-logfile-html.lsp |  4 +++-
 clamav-model.lua        | 17 +++++++++++++++++
 5 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index fece32f..ad70618 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 APP_NAME=clamav
 PACKAGE=acf-$(APP_NAME)
-VERSION=0.2.1
+VERSION=0.2.2
 
 APP_DIST=\
 	clamav*	\
diff --git a/clamav-controller.lua b/clamav-controller.lua
index 2fe0050..f664b57 100644
--- a/clamav-controller.lua
+++ b/clamav-controller.lua
@@ -24,3 +24,7 @@ end
 function expert(self)
 	return controllerfunctions.handle_form(self, function() return self.model.getfiledetails(self.clientdata.filename) end, self.model.updatefiledetails, self.clientdata, "Save", "Edit ClamAV File", "File Saved")
 end
+
+function logfile(self)
+	return self.model.getlogfile()
+end
diff --git a/clamav-expert-html.lsp b/clamav-expert-html.lsp
index 207f324..15b1930 120000
--- a/clamav-expert-html.lsp
+++ b/clamav-expert-html.lsp
@@ -1 +1 @@
-../expert-html.lsp
\ No newline at end of file
+../filedetails-html.lsp
\ No newline at end of file
diff --git a/clamav-logfile-html.lsp b/clamav-logfile-html.lsp
index a2ef389..fbe7221 100644
--- a/clamav-logfile-html.lsp
+++ b/clamav-logfile-html.lsp
@@ -3,5 +3,7 @@ require("viewfunctions")
 %>
 
 <% if viewlibrary and viewlibrary.dispatch_component then
-	viewlibrary.dispatch_component("alpine-baselayout/logfiles/view", {name="/var/log/messages", grep="clamav"})
+	for i,logfile in ipairs(data.value) do
+		viewlibrary.dispatch_component("alpine-baselayout/logfiles/view", {name=logfile.path, grep=logfile.grep})
+	end
 end %>
diff --git a/clamav-model.lua b/clamav-model.lua
index 22f5ea5..6735e1b 100644
--- a/clamav-model.lua
+++ b/clamav-model.lua
@@ -50,3 +50,20 @@ end
 function updatefiledetails(filedetails)
 	return modelfunctions.setfiledetails(filedetails, filelist)
 end
+
+function getlogfile ()
+	local files = {}
+	local logfilepath = format.parse_configfile(fs.read_file(filelist[1]) or "").LogFile
+	if not logfilepath then
+		files[#files+1] = {path = "/var/log/messages", grep = "clamd"}
+	else
+		files[#files+1] = {path=logfilepath}
+	end
+	logfilepath = format.parse_configfile(fs.read_file(filelist[2]) or "").UpdateLogFile
+	if not logfilepath then
+		files[#files+1] = {path = "/var/log/messages", grep = "freshclam"}
+	else
+		files[#files+1] = {path=logfilepath}
+	end
+	return cfe({ value=files, label="ClamAV logfiles" })
+end
-- 
cgit v1.2.3