Changed viewweblog to a form, reworked handling of config and weblog parameters, and added deniedyesno and bypassyesno config options.

1 files changed, 8 insertions, 2 deletions

diff --git a/weblog-controller.lua b/weblog-controller.lua
index 93c1cae..76f4db9 100644
--- a/weblog-controller.lua
+++ b/weblog-controller.lua
@@ -38,7 +38,13 @@ function viewactivitylog(self)
 end
 
 function viewweblog(self)
-	return self.model.getweblog(self.clientdata.activelog, self.clientdata.clientuserid, self.clientdata.starttime, self.clientdata.endtime, self.clientdata.clientip, self.clientdata.badyesno, self.clientdata.deniedyesno, self.clientdata.bypassyesno, self.clientdata.score, self.clientdata.urisearch, self.clientdata.sortby, self.clientdata.selected, clientdata.focus)
+	local retval = controllerfunctions.handle_form(self, self.model.getweblogparameters, self.model.getweblog, self.clientdata, "Update", "Display Weblog")
+	-- We want to get the weblog even if form wasn't submitted
+	if not self.clientdata.Update then
+		controllerfunctions.handle_clientdata(retval, self.clientdata)
+		retval = self.model.getweblog(retval)
+	end
+	return retval
 end
 
 function downloadweblog(self)
@@ -48,7 +54,7 @@ function downloadweblog(self)
 	local content = {"sourcename\tclientuserid\tclientip\tlogdatetime\turi\tbytes\treason\tscore\tshortreason\tbadyesno\tdeniedyesno\tbypassyesno"}
 	for i,log in ipairs(retval.value.log.value) do
 		content[#content+1] = string.format("%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s",
-			log.sourcename, log.clientuserid, log.clientip, log.logdatetime, log.uri, log.bytes, log.reason, log.score, log.shortreason, log.badyesno, log.deniedyesno, log.bypassyesno)
+			log.sourcename, log.clientuserid, log.clientip, log.logdatetime, log.uri, log.bytes, log.reason, log.score, log.shortreason or "", log.badyesno, log.deniedyesno, log.bypassyesno)
 	end
 	file.value = table.concat(content, "\n")
 	return file