diff options
author | Ted Trask <ttrask01@yahoo.com> | 2016-08-10 17:49:43 +0000 |
---|---|---|
committer | Ted Trask <ttrask01@yahoo.com> | 2016-08-10 17:49:43 +0000 |
commit | 315940a5ec5bca79a0092b150f7abcf5872a2f94 (patch) | |
tree | ce206982942158514d283262ac964fe2d6655bc9 | |
parent | 3c023b81b3eb64f37ec3b1ab052017fe552ec2a8 (diff) | |
download | acf-weblog-master.tar.bz2 acf-weblog-master.tar.xz |
-rw-r--r-- | weblog-adhocquery-html.lsp | 6 | ||||
-rw-r--r-- | weblog-listfiles-html.lsp | 2 | ||||
-rw-r--r-- | weblog-listsources-html.lsp | 4 | ||||
-rw-r--r-- | weblog-model.lua | 10 | ||||
-rw-r--r-- | weblog-status-html.lsp | 2 | ||||
-rw-r--r-- | weblog-viewweblog-html.lsp | 12 |
6 files changed, 18 insertions, 18 deletions
diff --git a/weblog-adhocquery-html.lsp b/weblog-adhocquery-html.lsp index 2ef0750..ee21bed 100644 --- a/weblog-adhocquery-html.lsp +++ b/weblog-adhocquery-html.lsp @@ -1,4 +1,4 @@ -<% local form, viewlibrary, page_info = ... +<% local form, viewlibrary, page_info = ... htmlviewfunctions = require("htmlviewfunctions") html = require("acf.html") %> @@ -20,7 +20,7 @@ html = require("acf.html") } </script> -<% +<% local tablesortercolumns = {} if form.value.types then @@ -45,7 +45,7 @@ end <% else %> <table id="adhocresult" class="tablesorter"> <thead> - <tr> + <tr> <% for i,name in ipairs(form.value.names.value) do %> <th><%= html.html_escape(name) %></th> <% end %> diff --git a/weblog-listfiles-html.lsp b/weblog-listfiles-html.lsp index ca7245f..71a6789 100644 --- a/weblog-listfiles-html.lsp +++ b/weblog-listfiles-html.lsp @@ -1,4 +1,4 @@ -<% local view, viewlibrary, page_info, session = ... +<% local view, viewlibrary, page_info, session = ... htmlviewfunctions = require("htmlviewfunctions") html = require("acf.html") %> diff --git a/weblog-listsources-html.lsp b/weblog-listsources-html.lsp index 090962b..a5b57e0 100644 --- a/weblog-listsources-html.lsp +++ b/weblog-listsources-html.lsp @@ -1,4 +1,4 @@ -<% local data, viewlibrary, page_info, session = ... +<% local data, viewlibrary, page_info, session = ... htmlviewfunctions = require("htmlviewfunctions") html = require("acf.html") %> @@ -31,7 +31,7 @@ html = require("acf.html") <th>Enabled</th> <th>Source</th> <th>Method</th> - </tr> + </tr> </thead><tbody> <% local sourcename = cfe({ type="hidden", value="" }) %> <% local redir = cfe({ type="hidden", value=page_info.orig_action }) %> diff --git a/weblog-model.lua b/weblog-model.lua index 3e11c7c..fae83a1 100644 --- a/weblog-model.lua +++ b/weblog-model.lua @@ -109,12 +109,12 @@ local deletedatabase = function() local cmdresult, errtxt = modelfunctions.run_executable({"psql", "-U", "postgres", "-c", cmd}, true) table.insert(result, errtxt) table.insert(result, cmdresult) - + cmd = "DROP ROLE "..DatabaseUser cmdresult, errtxt = modelfunctions.run_executable({"psql", "-U", "postgres", "-c", cmd}, true) table.insert(result, errtxt) table.insert(result, cmdresult) - + cmd = "DROP ROLE "..DatabaseOwner cmdresult, errtxt = modelfunctions.run_executable({"psql", "-U", "postgres", "-c", cmd}, true) table.insert(result, errtxt) @@ -280,7 +280,7 @@ local groompublogs = function() sql = "Delete from pubweblog where logdatetime < '" .. escape(temp) .."'" res = assert (con:execute(sql)) logme("Deleted " .. res .. " old records from pubweblog") - + sql = "delete from pubweblog_history where logdatetime < (now() - INTERVAL '1 year')" res = assert (con:execute(sql)) logme("Deleted " .. res .. " old records from pubweblog_history") @@ -530,7 +530,7 @@ local function checkwords(logentry) if not goodline then break end - + -- ignore blank lines if string.find(goodline, "%S") then _,instcnt = string.lower(logentry.URL):gsub(format.escapemagiccharacters(goodline), " ") @@ -696,7 +696,7 @@ local openlogfile = function(source, cookiesfile, logfile) else handle = proc.stdout end - + else errtxt = errmsg or "Unknown failure" end diff --git a/weblog-status-html.lsp b/weblog-status-html.lsp index 56f0ff9..55b273b 100644 --- a/weblog-status-html.lsp +++ b/weblog-status-html.lsp @@ -1,4 +1,4 @@ -<% local data, viewlibrary, page_info, session = ... +<% local data, viewlibrary, page_info, session = ... htmlviewfunctions = require("htmlviewfunctions") %> diff --git a/weblog-viewweblog-html.lsp b/weblog-viewweblog-html.lsp index 050489e..d61ac70 100644 --- a/weblog-viewweblog-html.lsp +++ b/weblog-viewweblog-html.lsp @@ -22,7 +22,7 @@ function string_highlight(txtvalue, searchval, fcolour, bcolour) txtvalue = string_insert(txtvalue,"</font>", sEnd) txtvalue = string_insert(txtvalue,"<font style='color:"..fcolour.."; background-color:"..bcolour..";'>", sStart) end - end + end return txtvalue end @@ -176,7 +176,7 @@ end %> local mark = '' if watch.selected == "t" then mark=' class="selected"' end local time = {} - time.year, time.month, time.day, time.hour, time.min, time.sec = + time.year, time.month, time.day, time.hour, time.min, time.sec = string.match(watch.logdatetime, "(%d+)%-(%d+)-(%d+)%s+(%d+):(%d+):(%d+)") time = os.time(time) %> <tr<%= mark %>> @@ -192,7 +192,7 @@ end %> <td><%= html.html_escape(watch.bytes) %></td> <td><span class="hide"><%= html.html_escape(watch.badyesno) %></span><% if watch.badyesno ~= "0" then %><img src='<%= html.html_escape(page_info.wwwprefix..page_info.staticdir) %>/dodgy.png' width='13' height='13'><% end %></td> <td><span class="hide"><%= html.html_escape(watch.deniedyesno) %></span><% if watch.deniedyesno ~= "0" then %> <img src='<%= html.html_escape(page_info.wwwprefix..page_info.staticdir) %>/denied.png' width='13' height='13'><% end %></td> - <td><span class="hide"><%= html.html_escape(watch.bypassyesno) %></span><% if watch.bypassyesno ~= "0" then %> <img src='<%= html.html_escape(page_info.wwwprefix..page_info.staticdir) %>/bypass.png' width='13' height='13'><% end %></td> + <td><span class="hide"><%= html.html_escape(watch.bypassyesno) %></span><% if watch.bypassyesno ~= "0" then %> <img src='<%= html.html_escape(page_info.wwwprefix..page_info.staticdir) %>/bypass.png' width='13' height='13'><% end %></td> <td><%= html.html_escape(watch.score) %></td> <td<% if (watch.shortreason and watch.shortreason ~= "" and watch.reason and watch.reason ~= "") then %> title="<%= html.html_escape(watch.reason) %>"<% end %>> <% if (watch.shortreason and watch.shortreason ~= "") then %> @@ -202,8 +202,8 @@ end %> <% end %> </td> <td title="<%= html.html_escape(watch.uri) %>"><% highlight_uri=html.html_escape(watch.shorturi or watch.uri) - if watch.wordloc ~= nil then - if string.find(watch.wordloc, "|") then + if watch.wordloc ~= nil then + if string.find(watch.wordloc, "|") then badwords = format.string_to_table(watch.wordloc, "|") for key,wrd in ipairs(badwords) do highlight_uri = string_highlight(highlight_uri, wrd, "yellow", "red") @@ -211,7 +211,7 @@ end %> else highlight_uri = string_highlight(highlight_uri, watch.wordloc, "yellow", "red") end - end %> + end %> <%= highlight_uri %></td> <td><%= watch.wordloc %></td> </tr> |