diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2016-08-10 14:47:59 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2016-08-10 14:47:59 +0000 |
| commit | de971065df7691796c524340abdd33c244924a87 (patch) | |
| tree | ad90d902602c6deab93518b7aac876f8af45ec51 | |
| parent | 4fbac68534586309b76e5574edafdaea39018d13 (diff) | |
| download | acf-alpine-conf-master.tar.bz2 acf-alpine-conf-master.tar.xz | |
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | lbu-config-html.lsp | 2 | ||||
| -rw-r--r-- | lbu-listbackups-html.lsp | 2 | ||||
| -rw-r--r-- | lbu-listchanges-html.lsp | 4 | ||||
| -rw-r--r-- | lbu-model.lua | 14 | ||||
| -rw-r--r-- | lbu-status-html.lsp | 2 |
6 files changed, 13 insertions, 13 deletions
@@ -9,7 +9,7 @@ APP_DIST=\ EXTRA_DIST=Makefile config.mk -DISTFILES=$(APP_DIST) $(EXTRA_DIST) +DISTFILES=$(APP_DIST) $(EXTRA_DIST) TAR=tar diff --git a/lbu-config-html.lsp b/lbu-config-html.lsp index 52d9d77..d43c733 100644 --- a/lbu-config-html.lsp +++ b/lbu-config-html.lsp @@ -1,4 +1,4 @@ -<% local form, viewlibrary, page_info, session = ... +<% local form, viewlibrary, page_info, session = ... htmlviewfunctions = require("htmlviewfunctions") %> diff --git a/lbu-listbackups-html.lsp b/lbu-listbackups-html.lsp index 167e06e..ddef1d1 100644 --- a/lbu-listbackups-html.lsp +++ b/lbu-listbackups-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/lbu-listchanges-html.lsp b/lbu-listchanges-html.lsp index 2b65046..8c27a1a 100644 --- a/lbu-listchanges-html.lsp +++ b/lbu-listchanges-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") %> @@ -23,7 +23,7 @@ end <% htmlviewfunctions.displayitemstart() %> Files changed since last commit <% htmlviewfunctions.displayitemmiddle() %> - <pre><% + <pre><% if (#view.value == 0) then io.write("None") else diff --git a/lbu-model.lua b/lbu-model.lua index e06add2..271a238 100644 --- a/lbu-model.lua +++ b/lbu-model.lua @@ -78,7 +78,7 @@ local function validateconfig(config) break end end - + config.value.DEFAULT_CIPHER.errtxt = "Invalid Cipher" for i,cipher in ipairs(config.value.DEFAULT_CIPHER.option) do if cipher == config.value.DEFAULT_CIPHER.value then @@ -86,7 +86,7 @@ local function validateconfig(config) break end end - + if config.value.PASSWORD.value == "" and config.value.ENCRYPTION.value then config.value.PASSWORD.errtxt = "Encryption without password is not allowed!\nDeactivate password protection or configure a password!" end @@ -144,7 +144,7 @@ local function validatefilecontent (filedetails) local config = mymodule.getconfig(nil, clientdata) local errors = {} for name,value in pairs(config.value) do - if value.errtxt then + if value.errtxt then errors[#errors+1] = value.errtxt end end @@ -193,7 +193,7 @@ function mymodule.getstatus () status["DEFAULT_CIPHER"] = config.value.DEFAULT_CIPHER status["DEFAULT_CIPHER"].seq=4 end - + return cfe({ type="group", value=status, label="LBU Status" }) end @@ -259,10 +259,10 @@ end function mymodule.setconfig (self, config) validateconfig(config) - + if not config.errtxt then local content = (fs.read_file(configfile) or "").."\n" - + -- LBU_MEDIA, ENCRYPTION, DEFAULT_CIPHER, PASSWORD content = replacestring(content, "[^\n%w]*LBU_MEDIA=[^\n]*\n", "LBU_MEDIA="..config.value.LBU_MEDIA.value.."\n") local newstring = "ENCRYPTION=$DEFAULT_CIPHER\n" @@ -370,7 +370,7 @@ function mymodule.commit(self, input) if input.value.delete.value then flag=flag.." -d" end input.descr, input.errtxt = modelfunctions.run_executable({"lbu", "commit", flag}, true) end - + return input end diff --git a/lbu-status-html.lsp b/lbu-status-html.lsp index e3966b0..91e65f2 100644 --- a/lbu-status-html.lsp +++ b/lbu-status-html.lsp @@ -1,4 +1,4 @@ -<% local view, viewlibrary, page_info, session = ... +<% local view, viewlibrary, page_info, session = ... htmlviewfunctions = require("htmlviewfunctions") %> |