Added groupby option to allow to view audit by clientuserid or clientip.

1 files changed, 11 insertions, 6 deletions

diff --git a/weblog-model.lua b/weblog-model.lua
index aeb401e..1311d1a 100644
--- a/weblog-model.lua
+++ b/weblog-model.lua
@@ -452,16 +452,18 @@ local listpubweblogentries = function(...)
 	return listlogentries("pubweblog", ...)
 end
 
-local grouppubblocklogentries = function(starttime, endtime)
+local grouppubblocklogentries = function(starttime, endtime, groupby)
+	groupby = groupby or "clientuserid"
 	local entries = {}
 	-- retrieve a cursor
-	local sql = "SELECT clientuserid, count(*) AS numblock, max(score) AS maxscore FROM pubblocklog"
+	local sql = "SELECT "..groupby..", count(*) AS numblock, max(score) AS maxscore FROM pubblocklog"
 	sql = sql .. generatewhereclause(nil, starttime, endtime)
-	sql = sql .. " GROUP BY clientuserid ORDER BY numblock DESC"
+	sql = sql .. " GROUP BY "..groupby.. " ORDER BY numblock DESC"
 	cur = assert (con:execute(sql))
 	row = cur:fetch ({}, "a")
 	while row do
-		entries[#entries+1] = {clientuserid=row.clientuserid, numblock=row.numblock, maxscore=row.maxscore}
+		entries[#entries+1] = {numblock=row.numblock, maxscore=row.maxscore}
+		entries[#entries][groupby] = row[groupby]
 		row = cur:fetch (row, "a")
 	end
 	-- close everything
@@ -992,11 +994,12 @@ function getauditstats()
 	local result = {}
 	result.auditstart = cfe({ value=config.auditstart or "", label="Audit Start Time" })
 	result.auditend = cfe({ value=config.auditend or "", label="Audit End Time" })
+	result.groupby = cfe({ value=config.groupby or "clientuserid", label="Group By" })
 	result.stats = cfe({ type="list", value={}, label="Audit Block Statistics" })
 	local res, err = pcall(function()
 		if config.auditstart ~= "" and config.auditend ~= "" then
 			databaseconnect(DatabaseUser)
-			result.stats.value = grouppubblocklogentries(config.auditstart, config.auditend) or {}
+			result.stats.value = grouppubblocklogentries(config.auditstart, config.auditend, result.groupby.value) or {}
 			databasedisconnect()
 		end
 	end)
@@ -1025,11 +1028,12 @@ function getconfig()
 	result.watchdays = cfe({ value=config.watchdays or "14", label="Days to Watch", descr="Number of additional days to keep history for users in watchlist" })
 	result.purgedays = cfe({ value=config.purgedays or "30", label="Days before Purge", descr="Days to keep history, regardless of audit" })
 	result.historydays = cfe({ value=config.historydays or "14", label="Days to keep History", descr="Days beyond Audit Start Time to keep complete log history" })
+	result.groupby = cfe({ type="select", value=config.groupby or "clientuserid", label="Group results by", option={"clientuserid", "clientip"} })
 	return cfe({ type="group", value=result, label="Weblog Config" })
 end
 
 function updateconfig(newconfig)
-	local success = true
+	local success = modelfunctions.validateselect(newconfig.value.groupby)
 	-- Validating a timestamp is going to be tricky, how about using postgres?
 	if newconfig.value.window.value == "" then
 		newconfig.value.window.errtxt = "Cannot be blank"
@@ -1057,6 +1061,7 @@ function updateconfig(newconfig)
 		configcontent = format.update_ini_file(configcontent, "", "watchdays", newconfig.value.watchdays.value)
 		configcontent = format.update_ini_file(configcontent, "", "purgedays", newconfig.value.purgedays.value)
 		configcontent = format.update_ini_file(configcontent, "", "historydays", newconfig.value.historydays.value)
+		configcontent = format.update_ini_file(configcontent, "", "groupby", newconfig.value.groupby.value)
 		
 		fs.write_file(configfile, configcontent)
 		config = format.parse_ini_file(configcontent, "") or {}