Removed redirect_to_referrer calls

4 files changed, 25 insertions, 13 deletions

diff --git a/squid-controller.lua b/squid-controller.lua
index 3174f61..3f7f5f6 100644
--- a/squid-controller.lua
+++ b/squid-controller.lua
@@ -21,7 +21,7 @@ digest = function( self )
 end
 
 enabledigestlist = function( self )
-	return self:redirect_to_referrer(self.model.enable_digest_userlist())
+	return self.handle_form(self, self.model.get_enable_digest_userlist, self.model.enable_digest_userlist, self.clientdata, "Enable", "Enable Digest User List", "Digest User List enabled")
 end
 
 expert = function( self )
@@ -73,5 +73,5 @@ function editfile(self)
 end
 
 function deletefile(self)
-	return self:redirect_to_referrer(self.model.deletefile(self.clientdata.filename))
+	return self.handle_form(self, self.model.getdeletefile, self.model.deletefile, self.clientdata, "Delete", "Delete Squid File", "Squid File Deleted")
 end
diff --git a/squid-digest-html.lsp b/squid-digest-html.lsp
index 104a9f2..67917a6 100644
--- a/squid-digest-html.lsp
+++ b/squid-digest-html.lsp
@@ -9,7 +9,7 @@
 	htmlviewfunctions.displayitem(form.value.status)
 	if form.value.status.errtxt then %>
 <dt></dt><dd><form action="<%= html.html_escape(page_info.script .. page_info.prefix .. page_info.controller .. "/enabledigestlist") %>">
-<input class="submit" type="submit" value="Enable"></form></dd>
+<input class="submit" type="submit" name="submit" value="Enable"></form></dd>
 <%	end
 %>
 </DL>
diff --git a/squid-listfiles-html.lsp b/squid-listfiles-html.lsp
index 7287e99..873c654 100644
--- a/squid-listfiles-html.lsp
+++ b/squid-listfiles-html.lsp
@@ -23,7 +23,7 @@ end %>
 			<%= html.link{value=page_info.script..page_info.prefix..page_info.controller.."/editfile?filename="..file.."&redir="..page_info.orig_action, label="Edit "} %>
 		<% end %>
 		<% if viewlibrary.check_permission("deletefile") then %>	
-			<%= html.link{value=page_info.script..page_info.prefix..page_info.controller.."/deletefile?filename="..file, label="Delete "} %>
+			<%= html.link{value=page_info.script..page_info.prefix..page_info.controller.."/deletefile?submit=true&filename="..file, label="Delete "} %>
 		<% end %>
 		</TD>
 		<TD style="white-space:nowrap;"><%= html.html_escape(file) %></TD>
diff --git a/squid-model.lua b/squid-model.lua
index 83389b1..525f034 100644
--- a/squid-model.lua
+++ b/squid-model.lua
@@ -83,7 +83,12 @@ update_digest_userlist = function(self, userlistdetails)
 	return read_digest_userlist()
 end
 
-enable_digest_userlist = function()
+get_enable_digest_userlist = function(self, clientdata)
+	local retval = {}
+	return cfe({ type="group", value=retval, label="Enable Digest User List" })
+end
+
+enable_digest_userlist = function(self, endigest)
 	configcontent = configcontent or fs.read_file(squidconf) or ""
 
 	local newline = "auth_param digest program /usr/sbin/digest_pw_auth "..squiddigestusers
@@ -117,7 +122,7 @@ enable_digest_userlist = function()
 	fs.write_file(squidconf, string.gsub(table.concat(lines, "\n"), "\n+$", ""))
 	config = nil
 	configcontent = nil
-	return cfe({ value="Successfully enabled user list", label="Enable digest user list result" })
+	return endigest
 end
 
 --[[
@@ -453,16 +458,23 @@ function updatefile(self, filedetails)
 	return modelfunctions.setfiledetails(self, filedetails, listfiles().value)
 end
 
-function deletefile(filename)
-	local retval = cfe({ label="Delete Squid File result", errtxt = "Failed to delete Squid File - invalid filename" })
+function getdeletefile(self, clientdata)
+	local retval = {}
+	retval.filename = cfe({ value=clientdata.filename or "", label="File Name" })
+	return cfe({ type="group", value=retval, label="Delete Squid File" })
+end
+
+function deletefile(self, delfile)
+	delfile.errtxt = "Failed to delete Squid File"
+	delfile.value.filename.errtxt = "Invalid filename"
 	for i,file in ipairs(listfiles().value) do
-		if filename == file then
-			retval.value = "Deleted Squid File"
-			retval.errtxt = nil
-			os.remove(filename)
+		if delfile.value.filename.value == file then
+			delfile.errtxt = nil
+			delfile.value.filename.errtxt = nil
+			os.remove(file)
 			break
 		end
 	end
 	
-	return retval
+	return delfile
 end