Removed unneeded views by updating CFE for autoview

3 files changed, 16 insertions, 29 deletions

diff --git a/fetchmail-createentry-html.lsp b/fetchmail-createentry-html.lsp
deleted file mode 120000
index 544c106..0000000
--- a/fetchmail-createentry-html.lsp
+++ /dev/null
@@ -1 +0,0 @@
-fetchmail-editentry-html.lsp
\ No newline at end of file
diff --git a/fetchmail-editentry-html.lsp b/fetchmail-editentry-html.lsp
deleted file mode 100644
index 3112425..0000000
--- a/fetchmail-editentry-html.lsp
+++ /dev/null
@@ -1,18 +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
-	if page_info.action == "editentry" then
-		form.value.remotehost.readonly = true
-		form.value.method.type = "text"
-		form.value.method.readonly = true
-		form.value.remotemailbox.readonly = true
-		form.value.localdomain.readonly = true
-	end
-	local order = { "remotehost", "enabled", "method", "remotemailbox", "remotepassword", "ssl", "localhost", "localmailbox", "localdomain", "envelope" }
-	htmlviewfunctions.displayform(form, order)
-%>
diff --git a/fetchmail-model.lua b/fetchmail-model.lua
index 0ab4a3d..d7a4e53 100644
--- a/fetchmail-model.lua
+++ b/fetchmail-model.lua
@@ -522,19 +522,25 @@ function readentries()
 end
 
 function readentry(entryname, meth, remotemailbx, localdom)
-	local enabled = cfe({ type="boolean", value=true, label="Enable" })
-	local method = cfe({ type="select", value="pop3", label="Method", option=methods })
-	local remotehost = cfe({ value=entryname, label="Remote Host" })
-	local remotemailbox = cfe({ label="Remote Mailbox" })
-	local remotepassword = cfe({ label="Password" })
-	local localhost = cfe({ label="Local Host" })
-	local localmailbox = cfe({ label="Local Mailbox" })
-	local localdomain = cfe({ label="Local Domain" })
-	local ssl = cfe({ type="boolean", value=false, label="SSL Encryption" })
-	local envelope = cfe({ type="select", value="X-Envelope-To", label="Envelope Mode", option={"X-Original-To", "Delivered-To", "X-Envelope-To", "Received", "disabled"} })
+	local enabled = cfe({ type="boolean", value=true, label="Enable", seq=2 })
+	local method = cfe({ type="select", value="pop3", label="Method", option=methods, seq=3 })
+	local remotehost = cfe({ value=entryname, label="Remote Host", seq=1 })
+	local remotemailbox = cfe({ label="Remote Mailbox", seq=4 })
+	local remotepassword = cfe({ label="Password", seq=5 })
+	local localhost = cfe({ label="Local Host", seq=7 })
+	local localmailbox = cfe({ label="Local Mailbox", seq=8 })
+	local localdomain = cfe({ label="Local Domain", seq=9 })
+	local ssl = cfe({ type="boolean", value=false, label="SSL Encryption", seq=6 })
+	local envelope = cfe({ type="select", value="X-Envelope-To", label="Envelope Mode", option={"X-Original-To", "Delivered-To", "X-Envelope-To", "Received", "disabled"}, seq=10 })
 
 	local entry = findentryline(entryname, meth, remotemailbx, localdom)
 	if entry then
+		remotehost.readonly = true
+		method.type = "text"
+		method.readonly = true
+		remotemailbox.readonly = true
+		localdomain.readonly = true
+
 		if entry[1] == "skip" then
 			enabled.value = false
 		end