From ef148d5564043f3dc843baa0d16de1e0cd254895 Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Sat, 27 Oct 2012 02:31:33 +0000
Subject: Removed unneeded views by updating CFE for autoview

---
 tcpproxy-editsmtpentry-html.lsp | 12 ------------
 tcpproxy-model.lua              | 16 ++++++++--------
 2 files changed, 8 insertions(+), 20 deletions(-)
 delete mode 100644 tcpproxy-editsmtpentry-html.lsp

diff --git a/tcpproxy-editsmtpentry-html.lsp b/tcpproxy-editsmtpentry-html.lsp
deleted file mode 100644
index c70c916..0000000
--- a/tcpproxy-editsmtpentry-html.lsp
+++ /dev/null
@@ -1,12 +0,0 @@
-<% local form, viewlibrary, page_info = ... 
-require("htmlviewfunctions")
-html = require("acf.html")
-%>
-
-<H1><%= html.html_escape(form.label) %></H1>
-<%
-	form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action
-	form.value.ipaddr.readonly = true
-	local order = {"ipaddr", "server", "addressonly", "domain", "optionalserver", "optionalrewritelist", "senderlistfile", "rcptlistfile"}
-	htmlviewfunctions.displayform(form, order)
-%>
diff --git a/tcpproxy-model.lua b/tcpproxy-model.lua
index 712f174..3d05062 100644
--- a/tcpproxy-model.lua
+++ b/tcpproxy-model.lua
@@ -259,14 +259,14 @@ function readsmtpentry(ipaddr)
 	local listfiles = listsmtpfiles()
 	table.insert(listfiles.value, 1, "")
 
-	local ipaddrcfe = cfe({ value=ipaddr, label="Interface / IP Address" })
-	local server = cfe({ label="SMTP Server", descr="Domain name / address of different machine or local binary" })
-	local addressonly = cfe({ type="boolean", value=false, label="Address Only", descr="Removes everything in the from field except address" })
-	local domain = cfe({ label="Custom Domain" })
-	local optionalserver = cfe({ label="Custom Domain Server", descr="Use this SMTP server[:port] for e-mails to Custom Domain" })
-	local optionalrewritelist = cfe({ type="select", label="Custom Domain Rewrite List", descr="File with a list for sender rewriting for Custom Domain", option=listfiles.value })
-	local senderlistfile = cfe({ type="select", label="Sender List File", descr="File with a list for sender rewriting (and valid senders)", option=listfiles.value })
-	local rcptlistfile = cfe({ type="select", label="Recipient List File", descr="File with a list for recipient rewriting (and valid recipients)", option=listfiles.value })
+	local ipaddrcfe = cfe({ value=ipaddr, label="Interface / IP Address", readonly=true, seq=0 })
+	local server = cfe({ label="SMTP Server", descr="Domain name / address of different machine or local binary", seq=1 })
+	local addressonly = cfe({ type="boolean", value=false, label="Address Only", descr="Removes everything in the from field except address", seq=2 })
+	local domain = cfe({ label="Custom Domain", seq=3 })
+	local optionalserver = cfe({ label="Custom Domain Server", descr="Use this SMTP server[:port] for e-mails to Custom Domain", seq=4 })
+	local optionalrewritelist = cfe({ type="select", label="Custom Domain Rewrite List", descr="File with a list for sender rewriting for Custom Domain", option=listfiles.value, seq=5 })
+	local senderlistfile = cfe({ type="select", label="Sender List File", descr="File with a list for sender rewriting (and valid senders)", option=listfiles.value, seq=6 })
+	local rcptlistfile = cfe({ type="select", label="Recipient List File", descr="File with a list for recipient rewriting (and valid recipients)", option=listfiles.value, seq=7 })
 
 	if exec and exec ~= "" then
 		local options = parsesmtpcmd(exec)
-- 
cgit v1.2.3