Commit ca1a6c99 authored by Ted Trask's avatar Ted Trask

Added shortreason to config, allowing users to choose whether they show full...

Added shortreason to config, allowing users to choose whether they show full or short reason in log.
parent e145ec58
......@@ -4,6 +4,6 @@ require("viewfunctions")
<H1><%= html.html_escape(form.label) %></H1>
<%
local order = {"auditstart", "auditend", "historydays", "watchdays", "purgedays", "window", "shorturi", "groupby"}
local order = {"auditstart", "auditend", "historydays", "watchdays", "purgedays", "window", "shorturi", "shortreason", "groupby"}
displayform(form, order, nil, page_info)
%>
......@@ -435,11 +435,13 @@ local listlogentries = function(logname, clientuserid, starttime, endtime, clien
cur = assert (con:execute(sql))
row = cur:fetch ({}, "a")
while row do
local uridescr = row.uri
if config.shorturi == "true" then
shorturi=string.gsub(row.uri, "[;?].*", "...")
end
entries[#entries+1] = {sourcename=row.sourcename, clientip=row.clientip, clientuserid=row.clientuserid, logdatetime=row.logdatetime, uri=row.uri, shorturi=shorturi, bytes=row.bytes, reason=row.reason, score=row.score, shortreason=row.shortreason}
if (config.shortreason ~= "true") then
entries[#entries].shortreason = nil
end
row = cur:fetch (row, "a")
end
-- close everything
......@@ -1194,8 +1196,8 @@ function getconfig()
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"} })
result.shorturi = cfe({ type="boolean", value=false, label="Truncate URLs", descr="You can limit the length of displayed URLs by enabling this option"})
if config.shorturi == "true" then result.shorturi.value = true end
result.shorturi = cfe({ type="boolean", value=(config.shorturi == "true"), label="Truncate URLs", descr="You can limit the length of displayed URLs by enabling this option"})
result.shortreason = cfe({ type="boolean", value=(config.shortreason == "true"), label="Short Reason", descr="Display a short reason (without objectional words)"})
return cfe({ type="group", value=result, label="Weblog Config" })
end
......@@ -1252,6 +1254,7 @@ function updateconfig(newconfig)
configcontent = format.update_ini_file(configcontent, "", "historydays", newconfig.value.historydays.value)
configcontent = format.update_ini_file(configcontent, "", "groupby", newconfig.value.groupby.value)
configcontent = format.update_ini_file(configcontent, "", "shorturi", tostring(newconfig.value.shorturi.value))
configcontent = format.update_ini_file(configcontent, "", "shortreason", tostring(newconfig.value.shortreason.value))
fs.write_file(configfile, configcontent)
config = format.parse_ini_file(configcontent, "") or {}
......
......@@ -100,7 +100,7 @@ end
<% if (watch.shortreason and watch.shortreason ~= "") then %>
<%= html.html_escape(watch.shortreason) %>
<% elseif (watch.reason and watch.reason ~= "") then %>
<%= html.html_escape(string.gsub(watch.reason, "%(.*", "")) %>
<%= html.html_escape(watch.reason) %>
<% end %>
</TD></TR>
<% end %>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment