diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | weblog-editsource-html.lsp | 1 | ||||
| -rw-r--r-- | weblog-model.lua | 3 | ||||
| -rw-r--r-- | weblog-status-html.lsp | 2 |
4 files changed, 5 insertions, 3 deletions
@@ -1,6 +1,6 @@ APP_NAME=weblog PACKAGE=acf-$(APP_NAME) -VERSION=0.3.0 +VERSION=0.3.1 APP_DIST=\ weblog* \ diff --git a/weblog-editsource-html.lsp b/weblog-editsource-html.lsp index c05a556..c15e30e 100644 --- a/weblog-editsource-html.lsp +++ b/weblog-editsource-html.lsp @@ -5,6 +5,7 @@ require("viewfunctions") <H1><%= html.html_escape(form.label) %></H1> <% form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action + form.value.passwd.type = "password" if page_info.action == "editsource" then form.value.sourcename.readonly = true end diff --git a/weblog-model.lua b/weblog-model.lua index c5f6f5b..9e32e53 100644 --- a/weblog-model.lua +++ b/weblog-model.lua @@ -552,7 +552,8 @@ local connecttosource = function(source, cookiesfile) local success = false logme("Connecting to source "..source.sourcename) if source.method == "http" or source.method == "https" then - local cmd = "wget -O - --no-check-certificate --save-cookies "..cookiesfile.." --keep-session-cookies --post-data 'password="..source.passwd.."&userid="..source.userid.."&Logon=Logon' '"..source.method.."://"..source.source.."/cgi-bin/acf/acf-util/logon/logon' 2>/dev/null" + fs.write_file(cookiesfile, "password="..source.passwd.."&userid="..source.userid.."&Logon=Logon") + local cmd = "wget -O - --no-check-certificate --save-cookies "..cookiesfile.." --keep-session-cookies --post-file '"..cookiesfile.."' '"..source.method.."://"..format.escapespecialcharacters(source.source).."/cgi-bin/acf/acf-util/logon/logon' 2>/dev/null" local f = io.popen(cmd) local resultpage = f:read("*a") f:close() diff --git a/weblog-status-html.lsp b/weblog-status-html.lsp index 7ad89a2..d0784ba 100644 --- a/weblog-status-html.lsp +++ b/weblog-status-html.lsp @@ -7,7 +7,7 @@ require("viewfunctions") <H1>Weblog Database Status</H1> <% local status if viewlibrary and viewlibrary.dispatch_component then - if session.permissions.postgresql.status then + if session.permissions.postgresql and session.permissions.postgresql.status then status = viewlibrary.dispatch_component("postgresql/postgresql/status", nil, true) end end |