Added config to fetchmail to configure globals and multiple entries. Also added ability to run once and test. Still need support for ETRN and SSL.

git-svn-id: svn://svn.alpinelinux.org/acf/fetchmail/trunk@1437 ab2d0c66-481e-0410-8bed-d214d4d58bed

1 files changed, 17 insertions, 152 deletions

diff --git a/fetchmail-config-html.lsp b/fetchmail-config-html.lsp
index ac6dbd6..b686400 100644
--- a/fetchmail-config-html.lsp
+++ b/fetchmail-config-html.lsp
@@ -1,160 +1,25 @@
-<% local form = ... 
-require("viewfunctions")
-%>
-<%
---[[ DEBUG INFORMATION
-io.write("<H1>DEBUGGING</H1><span style='color:red'><H2>DEBUG INFO: CFE</H2>")
-io.write(html.cfe_unpack(form))
-io.write("</span>")
---]]
-%>
+<% local view, viewlibrary, page_info, session = ... %>
+<% require("viewfunctions") %>
 
-<H1>SYSTEM INFO</H1>
-<DL>
-<% 
-local myform = form.status 
-local tags = { "status", "version", "autostart", }
-displayinfo(myform,tags,"viewonly")
-%>
-</DL>
-
-<H1>CONFIGURATION</H1>
-<% local myform = form.config %>
-<form action="<%= form.option.script .. "/" .. form.option.prefix ..
-		form.option.controller .. "/" .. form.option.action %>" method="POST">
+<% displaycommandresults({"deleteentry"}, session) %>
 
-<H2>GUIDED CONFIGURATION</H2>
-<% --[[ %>
-<H3>FREQUENCY</H3>
-<P>Select how often the mailboxes will be checked. For ETRN transfers (below) this specifies how often transfers are initiated</P>
-<% 
-local tags = { "freq", }
-displayinfo(myform,tags)
-%>
-<% --]] %>
+<% if viewlibrary and viewlibrary.dispatch_component then
+	viewlibrary.dispatch_component("status")
+end %>
 
-<H3>MAILBOXES</H3>
-<P>You will need to specify the remote mailbox and password, as well as the local (internal) mailbox to forward the mail to. The SMTP host is the name or address of the SMTP server to send the mail to.</P>
-<P>If you want to use POP3 account for the entire domain, selecting the <U>pop3domain</U> method will setup the appropriate configuration for retrieving and distributing the mail appropriately. The <B>domain</B> information should be your internet smtp domain. The <B>mailbox</B> field is ignored when this method is selected.</P>
+<H1>Global Settings</H1>
 
-<P>When selecting the <U>pop3</U> or <U>imap</U> methods, the <B>domain</B> field should be left blank.</P>
-<% -- START - SPECIAL VIEW FOR SHOWING AVAILABLE MAILBOXES %>
-<%
-local tags = "mailboxes" 
-local mailboxform = myform[tags]["value"]
-%>
 <DL>
-<% 
-	io.write("\n\t<CENTER><TABLE STYLE='border:1px solid #ccc;background:#eee'>\n\t\t<TR>\n\t\t\t<TD CLASS='header' WIDTH='150px'>")
-	io.write("<CENTER>METHOD</CENTER></TD>\n\t\t\t<TD CLASS='header' COLSPAN=2>")
-	io.write("<CENTER>REMOTE</CENTER></TD>\n\t\t\t<TD CLASS='header' COLSPAN=2>")
-	io.write("<CENTER>LOCAL</CENTER></TD>\n\t\t</TR>")
-for i=1, table.maxn(mailboxform) do
-		leftpadd="30px"
-		rightpadd="5px"
-
-		io.write("\n\t\t<TR>\n\t\t\t<TD>")
-			val = "method"
-			io.write(html.form[mailboxform[i][val]["type"]](mailboxform[i][val]))
-		io.write("</TD>\n\t\t\t<TD style='padding-left:".. leftpadd .. ";padding-right:".. rightpadd .. ";' WIDTH='5%'>")
-			val = "remotehost"
-			io.write(mailboxform[i][val]["label"])
-		io.write(":</TD>\n\t\t\t<TD>")
-			io.write(html.form[mailboxform[i][val]["type"]](mailboxform[i][val]))
-		io.write("</TD>\n\t\t\t<TD style='padding-left:".. leftpadd .. ";padding-right:".. rightpadd .. ";' WIDTH='5%'>")
-			val = "localhost"
-			io.write(mailboxform[i][val]["label"])
-		io.write(":</TD>\n\t\t\t<TD>")
-			io.write(html.form[mailboxform[i][val]["type"]](mailboxform[i][val]))
-		io.write("</TD>\n\t\t</TR>")
-		io.write("\n\t\t<TR>\n\t\t\t<TD>")
-			val = "disabled"
-			io.write(html.form[mailboxform[i][val]["type"]](mailboxform[i][val]))
-			io.write(" " .. mailboxform[i][val]["label"])
-		io.write("</TD>\n\t\t\t<TD style='padding-left:".. leftpadd .. ";padding-right:".. rightpadd .. ";'>")
-			val = "remotemailbox"
-			io.write(mailboxform[i][val]["label"])
-		io.write(":</TD>\n\t\t\t<TD>")
-			io.write(html.form[mailboxform[i][val]["type"]](mailboxform[i][val]))
-		io.write("</TD>\n\t\t\t<TD style='padding-left:".. leftpadd .. ";padding-right:".. rightpadd .. ";'>")
-			val = "localmailbox"
-			io.write(mailboxform[i][val]["label"])
-		io.write(":</TD>\n\t\t\t<TD>")
-			io.write(html.form[mailboxform[i][val]["type"]](mailboxform[i][val]))
-		io.write("</TD>\n\t\t</TR>")
-		io.write("\n\t\t<TR>\n\t\t\t<TD>")
-		io.write("</TD>\n\t\t\t<TD style='padding-left:".. leftpadd .. ";padding-right:".. rightpadd .. ";'>")
-			val = "remotepassword"
-			io.write(mailboxform[i][val]["label"])
-		io.write(":</TD>\n\t\t\t<TD>")
-			io.write(html.form[mailboxform[i][val]["type"]](mailboxform[i][val]))
-		io.write("</TD>\n\t\t\t<TD style='padding-left:".. leftpadd .. ";padding-right:".. rightpadd .. ";'>")
-			val = "localdomain"
-			io.write(mailboxform[i][val]["label"])
-		io.write(":</TD>\n\t\t\t<TD>")
-			io.write(html.form[mailboxform[i][val]["type"]](mailboxform[i][val]))
-		io.write("</TD>\n\t\t</TR>")
-		io.write("\n\t\t<TR>\n\t\t\t<TD COLSPAN=5><HR></TD>\n\t\t</TR>")
-end
-io.write("</TABLE></CENTER>")
-%>
+<dt>Edit global settings</dt>
+<dd><form action="<%= page_info.script .. page_info.prefix .. page_info.controller .. "/editconfig" %>" method="POST">
+<input type=submit value="Edit" class="submit">
+</form></dd>
 </DL>
-<% -- START - SPECIAL VIEW FOR SHOWING AVAILABLE MAILBOXES %>
-
-<H3>LAST RESORT</H3>
-<P>The Postmaster address is the address of last resort when fetchmail cannot determine how to send a mail message. If left blank, undelieverable mail may be discarded.</P>
-<% 
-local tags = { "postmaster", }
-displayinfo(myform,tags)
-%>
-
-<H3>ETRN</H3>
-<P>This is for branches that have DNS mail domains hosted by an ISP that allows for ETRN dequeueing. ETRN dequeueing causes the SMTP mail exchanger at the ISP to forward mail to you via SMTP. You will need to make sure that DNS is setup appropriately and that your ISP supports ETRN. If you have not arranged with your ISP to have ETRN support, leave these fields blank.</P>
-<% 
-local tags = { "etrnremote","etrnquedomain", }
-displayinfo(myform,tags)
-%>
-
-
-<% --[[ %>
-<H2>ADVANCED CONFIGURATION</H2>
-<H3>GENERAL</H3>
-<% 
-local tags = { "logfile", "loglevel", "smallerlogs", }
-displayinfo(myform,tags)
-%>
-
-<% --]] %>
-
-<H2>SAVE AND APPLY ABOVE SETTINGS</H2>
-<% 
-local tags = { "cmdsave","cmdtest", }
-displayinfo(myform,tags)
-%>
-</form>
-
-<% 
-local cmdform = form.management
-local tags = { "start", "stop", "restart" }
-if (cmdform) and (cmdform[tags[1]]) then
-%>
-	<form name="management" action="" method="POST">
-	<H1>MANAGEMENT</H1>
-	<dl>
-		<dt><%= cmdform[tags[1]]["label"] %></dt>
-		<dd>
-		<% for k,v in pairs(tags) do %>
-			<% if (cmdform[v]) then %>
-				<% io.write(html.form[cmdform[v].type](cmdform[v])) %>
-			<% end %>
-		<% end %>
-		</dd>
 
-		<% if (form.cmdmanagement) and (#form.cmdmanagement.descr > 0) then %>
-		<dt>Previous action result</dt>
-			<dd><pre><%= form.cmdmanagement.descr %></pre></dd>
-		<% end %>
-	</dl>
-	</form>
+<% if viewlibrary and viewlibrary.dispatch_component then
+	viewlibrary.dispatch_component("listentries")
+end %>
 
-<% end %>
+<% if viewlibrary and viewlibrary.dispatch_component then
+	viewlibrary.dispatch_component("startstop")
+end %>