Removed calls to redirect_to_referrer and fixed smtpstatus

1 files changed, 22 insertions, 7 deletions

diff --git a/tcpproxy-model.lua b/tcpproxy-model.lua
index 75d5c7b..712f174 100644
--- a/tcpproxy-model.lua
+++ b/tcpproxy-model.lua
@@ -6,6 +6,7 @@ validator = require("acf.validator")
 fs = require("acf.fs")
 require("posix")
 format = require("acf.format")
+processinfo = require("acf.processinfo")
 
 -- Set variables
 local configfile = "/etc/tcpproxy.conf"
@@ -332,9 +333,16 @@ function updatesmtpentry(self, entry)
 	return entry
 end
 
-function delsmtpentry(ipaddr)
-	setsmtpcmd(ipaddr, nil)
-	return cfe({ value="Deleted SMTP Proxy Entry", label="Delete SMTP Entry result" })
+function getdelsmtpentry(self, clientdata)
+	local retval = {}
+	retval.ipaddr = cfe({ value=clientdata.ipaddr or "", label="IP Address" })
+	return cfe({ type="group", value=retval, label="Delete SMTP Proxy Entry" })
+end
+
+function delsmtpentry(self, delentry)
+	-- TODO - validate ipaddr
+	setsmtpcmd(delentry.value.ipaddr.value, nil)
+	return delentry
 end
 
 function listsmtpfiles()
@@ -384,14 +392,21 @@ function updatesmtpfile(self, filedetails)
 	return modelfunctions.setfiledetails(self, filedetails, function(filename) return validator.is_valid_filename(filename, smtpdirectory) end)
 end
 
-function delsmtpfile(filename)
-	local retval = cfe({ value="Deleted SMTP Proxy File", label="Delete SMTP File result" })
+function getdelsmtpfile(self, clientdata)
+	local retval = {}
+	retval.filename = cfe({ value=clientdata.filename or "", label="File Name" })
+	return cfe({ type="group", value=retval, label="Delete SMTP Proxy File" })
+end
+
+function delsmtpfile(self, delfile)
+	local filename = delfile.value.filename.value
 	if validator.is_valid_filename(filename, smtpdirectory) and fs.is_file(filename) then
 		os.remove(filename)
 	else
-		retval.value = "Failed to delete SMTP Proxy File - invalid filename"
+		delfile.errtxt = "Failed to delete SMTP Proxy File"
+		delfile.value.filename.errtxt = "Invalid filename"
 	end
 	
-	return retval
+	return delfile
 end