summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2012-08-15 16:09:31 +0000
committerTed Trask <ttrask01@yahoo.com>2012-08-15 16:09:31 +0000
commit7c9c234143748e29309584215d1494ef1fc8eff7 (patch)
treeeca888483b3b76eca7254f7bcef62d2df4e3fa86
parent261e51a6d59ac9252f3f98f7dd68500ca2db3e6a (diff)
downloadacf-tinydns-7c9c234143748e29309584215d1494ef1fc8eff7.tar.bz2
acf-tinydns-7c9c234143748e29309584215d1494ef1fc8eff7.tar.xz
Removed call to redirect_to_referrer
-rw-r--r--tinydns-controller.lua2
-rw-r--r--tinydns-listfiles-html.lsp2
-rw-r--r--tinydns-model.lua20
3 files changed, 15 insertions, 9 deletions
diff --git a/tinydns-controller.lua b/tinydns-controller.lua
index 54fa603..cd623b3 100644
--- a/tinydns-controller.lua
+++ b/tinydns-controller.lua
@@ -59,7 +59,7 @@ function editfile(self)
end
function delete(self)
- return self:redirect_to_referrer(self.model.remove_file(self, self.clientdata.filename, sessiondata.userinfo.userid))
+ return self.handle_form(self, self.model.get_remove_file, function(self, value) return self.model.remove_file(self, value, sessiondata.userinfo.userid) end, self.clientdata, "Delete", "Delete Config File", "Config File deleted")
end
function listpermissions(self)
diff --git a/tinydns-listfiles-html.lsp b/tinydns-listfiles-html.lsp
index 47a1695..689ed08 100644
--- a/tinydns-listfiles-html.lsp
+++ b/tinydns-listfiles-html.lsp
@@ -18,7 +18,7 @@ require("htmlviewfunctions")
<TR>
<TD style="padding-right:20px;white-space:nowrap;">
<%
- if viewlibrary.check_permission("delete") then io.write(html.link{value = "delete?filename=" .. file.value.filename.value, label="Delete " }) end
+ if viewlibrary.check_permission("delete") then io.write(html.link{value = "delete?submit=true&filename=" .. file.value.filename.value, label="Delete " }) end
io.write(html.link{value = "view?filename=" .. file.value.filename.value, label="View " })
if viewlibrary.check_permission("edit") then io.write(html.link{value = "edit?filename=" .. file.value.filename.value.."&redir="..page_info.orig_action, label="Edit " }) end
if viewlibrary.check_permission("editfile") then io.write(html.link{value = "editfile?filename=" .. file.value.filename.value.."&redir="..page_info.orig_action, label="Expert " }) end
diff --git a/tinydns-model.lua b/tinydns-model.lua
index 50fafa3..baf0f8d 100644
--- a/tinydns-model.lua
+++ b/tinydns-model.lua
@@ -317,19 +317,25 @@ function createconfigfile(self, configfile, userid)
return configfile
end
-function remove_file(self, path, userid)
+function get_remove_file(self, clientdata)
+ local retval = {}
+ retval.filename = cfe({ value=clientdata.filename or "", label="File Name" })
+ return cfe({ type="group", value=retval, label="Delete Config File" })
+end
+
+function remove_file(self, delfile, userid)
+ local path = delfile.value.filename.value
configfiles = searchforconfigfiles(self, userid)
- local success = "Failed to delete file"
- local errtxt
+ delfile.errtxt = "Failed to delete file"
if not (fs.is_file(path)) then
- errtxt = "File doesn't exist!"
+ delfile.value.filename.errtxt = "File doesn't exist!"
elseif (validfilename(path)) then
os.remove(path)
- success = "File Deleted"
+ delfile.errtxt = nil
else
- errtxt = "Not a valid filename!"
+ delfile.value.filename.errtxt = "Not a valid filename!"
end
- return cfe({ value=success, label="Delete config file result", errtxt=errtxt })
+ return delfile
end
function getpermissionslist(self)