Added / removed files

8 files changed, 80 insertions, 86 deletions

diff --git a/bypass.png b/bypass.png
new file mode 100644
index 0000000..896070e
--- /dev/null
+++ b/bypass.png
diff --git a/denied.png b/denied.png
new file mode 100644
index 0000000..0238f3d
--- /dev/null
+++ b/denied.png
diff --git a/dodgy.png b/dodgy.png
new file mode 100644
index 0000000..b035ba9
--- /dev/null
+++ b/dodgy.png
diff --git a/weblog-maintenance-html.lsp b/weblog-maintenance-html.lsp
deleted file mode 100644
index 2ca1dc7..0000000
--- a/weblog-maintenance-html.lsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<% local form, viewlibrary, page_info = ... 
-require("viewfunctions")
-%>
-
-<style type="text/css">
-  #content table { border-collapse: collapse; width: 100%; }
-  #content table td { white-space: normal; padding-right:20px; border-bottom:1px solid #999; }
-  #content table tr.mark { background: #E9E9E9; }
-</style>
-
-<H1>Maintenance</H1>
-<% displayformstart(form, page_info) %>
-<% displayformitem(form.value.query, "query") %>
-<% displayformend(form) %>
-<H2>Purge Database Operations</H2>
-<H3>Analysis Operations</H3>
-<H4>Actions</H4>
diff --git a/weblog-summary-html.lsp b/weblog-summary-html.lsp
deleted file mode 100644
index 60040b5..0000000
--- a/weblog-summary-html.lsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<% local form, viewlibrary, page_info = ... 
-require("viewfunctions")
-%>
-
-<style type="text/css">
-  #content table { border-collapse: collapse; width: 100%; }
-  #content table td { white-space: normal; padding-right:20px; border-bottom:1px solid #999; }
-  #content table tr.mark { background: #E9E9E9; }
-</style>
-
-<H1>Summary</H1>
-<H2>Last 24 Hours</H2>
-<H2>Last 7 Days</H2>
-<H2>Last 30 Days</
-<% displayformstart(form, page_info) %>
-<% displayformitem(form.value.query, "query") %>
-<% displayformend(form) %>
diff --git a/weblog-viewauditstats-html.lsp b/weblog-viewauditstats-html.lsp
new file mode 100644
index 0000000..efe02f3
--- /dev/null
+++ b/weblog-viewauditstats-html.lsp
@@ -0,0 +1,47 @@
+<% local data, viewlibrary, page_info, session = ... %>
+<% require("viewfunctions") %>
+
+<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script>
+<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery.tablesorter.js"></script>
+<script type="text/javascript">
+	$(document).ready(function() {
+		$("#audit").tablesorter({headers: {1:{sorter:'digit'}, 2:{sorter:'digit'}}});
+	});
+</script>
+
+<% displaycommandresults({"completeaudit"}, session) %>
+
+<H1>Audit Parameters</H1>
+<DL>
+<% displayitem(data.value.auditstart) %>
+<% displayitem(data.value.auditend) %>
+</DL>
+
+<H1><%= html.html_escape(data.label) %></H1>
+<DL>
+<TABLE id="audit" class="tablesorter"><THEAD>
+	<TR style="font-weight:bold;">
+		<TH><% if data.value.groupby.value == "clientip" then %>Client IP<% else %>User ID<% end %></TH>
+		<TH>Blocks</TH>
+		<TH>Maximum Score</TH>
+	</TR>
+</THEAD><TBODY>
+<% for i,stat in ipairs(data.value.stats.value) do %>
+	<TR><TD><%= html.link{value = "viewblocklog?"..data.value.groupby.value.."="..stat[data.value.groupby.value], label=stat[data.value.groupby.value]} %></TD>
+	<TD><%= html.html_escape(stat.numblock) %></TD>
+	<TD><%= html.html_escape(stat.maxscore) %></TD></TR>
+<% end %>
+</TBODY></TABLE>
+
+<% if data.errtxt then %>
+<p class='error'><%= html.html_escape(data.errtxt) %></p>
+<% end %>
+<% if #data.value.stats.value == 0 then %>
+<p>No blocks, try adjusting the audit dates</p>
+<% end %>
+
+<form action="<%= html.html_escape(page_info.script .. page_info.prefix .. page_info.controller .. "/completeaudit") %>">
+<DT>Complete Audit</DT>
+<DD><input class="submit" type="submit" value="Complete"></DD>
+</form>
+</DL>
diff --git a/weblog-viewusagestats-html.lsp b/weblog-viewusagestats-html.lsp
new file mode 100644
index 0000000..0d534e1
--- /dev/null
+++ b/weblog-viewusagestats-html.lsp
@@ -0,0 +1,33 @@
+<% local data, viewlibrary, page_info, session = ... %>
+<% require("viewfunctions") %>
+
+<% local subdata, pagedata = paginate(data.value, page_info.clientdata, 100) %>
+
+<H1><%= html.html_escape(data.label) %></H1>
+<DL>
+<% displaypagination(pagedata, page_info) %>
+<TABLE>
+	<TR style="background:#eee;font-weight:bold;">
+		<TD style="padding-right:20px;white-space:nowrap;" class="header">Date</TD>
+		<TD style="padding-right:20px;white-space:nowrap;" class="header">Source</TD>
+		<TD style="padding-right:20px;white-space:nowrap;" class="header">Requests</TD>
+		<TD style="white-space:nowrap;" WIDTH="90%" class="header">Blocks</TD>
+	</TR>
+
+<% for i,stat in ipairs(subdata) do %>
+	<TR>
+		<TD><%= html.html_escape(stat.date) %></TD>
+		<TD><%= html.html_escape(stat.sourcename) %></TD>
+		<TD><%= html.html_escape(stat.numrequest) %></TD>
+		<TD><%= html.html_escape(stat.numblock) %></TD>
+	</TR>
+<% end %>
+</TABLE>
+
+<% if data.errtxt then %>
+<p class='error'><%= html.html_escape(data.errtxt) %></p>
+<% end %>
+<% if #data.value == 0 then %>
+<p>No usage stats found</p>
+<% end %>
+</DL>
diff --git a/weblogviewfunctions.lua b/weblogviewfunctions.lua
deleted file mode 100644
index b809f23..0000000
--- a/weblogviewfunctions.lua
+++ /dev/null
@@ -1,52 +0,0 @@
-require("html")
-require("session")
-
--- Split a string to an array by delimiter or pattern
-function split(str, pat)
-   if string.find(str, pat) == nil then
-       return str
-   end
-   local t = {}
-   local fpat = "(.-)" .. pat
-   local last_end = 1
-   local s, e, cap = str:find(fpat, 1)
-   while s do
-     if s ~= 1 or cap ~= "" then
-        table.insert(t,cap)
-     end
-     last_end = e+1
-     s, e, cap = str:find(fpat, last_end)
-   end
-   if last_end <= #str then
-      cap = str:sub(last_end)
-      table.insert(t, cap)
-   end
-   return t
-end
--- Insert a string into another string
-function string.insert(value, insert, place)
-
-   if place == nil then
-          place = string.len(value)+1
-   end
-             
-   return string.sub(value, 1,place-1) .. tostring(insert) .. string.sub(value, place, string.len(value))
-                
-end
-
---Highlight occurences of a word in a string
-function string.highlight(txtvalue, searchval, fcolour, bcolour)
-
-  if txtvalue ~=nil and searchval ~= nil then
-   sStart = string.find(string.lower(txtvalue),string.lower(searchval))
-   if sStart ~= nil then
-     sEnd = sStart + string.len(searchval)
-     txtvalue = string.insert(txtvalue,"</font>", sEnd)
-     txtvalue = string.insert(txtvalue,"<font style='color:"..fcolour.."; background-color:"..bcolour..";'>", sStart)
-   end
-  end
-                                              
-  return txtvalue
-                                                 
-end
-