summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2008-04-30 20:36:02 +0000
committerTed Trask <ttrask01@yahoo.com>2008-04-30 20:36:02 +0000
commitd9a9c68eecd41c0e8a95a3d379797380760c90e9 (patch)
tree6335f5011f39c6a65fced445e47a9a2e357986ed
parentbaac30e2eea27c97de2583b530911a9d987b4f9e (diff)
downloadacf-tinydns-d9a9c68eecd41c0e8a95a3d379797380760c90e9.tar.bz2
acf-tinydns-d9a9c68eecd41c0e8a95a3d379797380760c90e9.tar.xz
Modified cfe, removing option, errtxt, and name, and adding label - This may break things.
Rewrote password module, adding model Modified authenticator to make password module work git-svn-id: svn://svn.alpinelinux.org/acf/tinydns/trunk@1052 ab2d0c66-481e-0410-8bed-d214d4d58bed
-rw-r--r--tinydns-controller.lua4
-rw-r--r--tinydns-status-html.lsp4
2 files changed, 3 insertions, 5 deletions
diff --git a/tinydns-controller.lua b/tinydns-controller.lua
index a617cf0..640fbe7 100644
--- a/tinydns-controller.lua
+++ b/tinydns-controller.lua
@@ -84,8 +84,6 @@ local function displaycmdmanagement(pidofstatus)
-- next CFE can be used to present the result of the previous action
management.actionresult = cfe({ name="actionresult",
label="Previous action result",
- descr="", --Content of this variable is displayed as <PRE> ... </PRE> in BLACK text
- errtxt="", --Content of this variable is displayed as <PRE> ... </PRE> in RED text
})
-- Disable management buttons based on if the process is running or not
@@ -263,7 +261,7 @@ function expert(self)
else
create.name.errtxt = "Incorrect filename"
end
- if (#create.name.errtxt == 0) then
+ if (create.name.errtxt) then
create.cmdnew.descr = "* File was created"
redirect(self, "edit?name=" .. (self.clientdata.name or ""))
end
diff --git a/tinydns-status-html.lsp b/tinydns-status-html.lsp
index d659aa7..90b7179 100644
--- a/tinydns-status-html.lsp
+++ b/tinydns-status-html.lsp
@@ -28,7 +28,7 @@ io.write("<DL>")
if (myform) and (myform.value) then
local val = myform
io.write("\n\t<DT")
- if (#val.errtxt > 0) then
+ if (val.errtxt) then
io.write(" class='error'")
end
io.write(">" .. val.label .. "</DT>")
@@ -43,7 +43,7 @@ if (myform) and (myform.value) then
end
if (val.descr) and (#val.descr > 0) then io.write("\n\t\t<P CLASS='descr'>" .. string.gsub(val.descr, "\n", "<BR>") .. "</P>") end
- if (#val.errtxt > 0) then io.write("\n\t\t<P CLASS='error'>" .. string.gsub(val.errtxt, "\n", "<BR>") .. "</P>") end
+ if (val.errtxt) then io.write("\n\t\t<P CLASS='error'>" .. string.gsub(val.errtxt, "\n", "<BR>") .. "</P>") end
io.write("\n\t\t</DD>")
end
io.write("</DL>")