When you have a valid configuration in /etc/.fetchmailrc you will see the result in the config-tab.

Valid config should be placed between rows '#Begin Fetchmail...' and '#End Fetchmail...' (each config should be in one row).

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

1 files changed, 26 insertions, 24 deletions

diff --git a/fetchmail-config-html.lsp b/fetchmail-config-html.lsp
index df784c7..7c0a0ca 100644
--- a/fetchmail-config-html.lsp
+++ b/fetchmail-config-html.lsp
@@ -59,12 +59,14 @@ informationform(myform,tags)
 		form.option.controller .. "/" .. form.option.action ?>" method="POST">
 
 <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", }
 configform(myform,tags)
 ?>
+<? --]] ?>
 
 <H3>MAILBOXES</H3>
 <P>In the boxes below, select up to 10 mailboxes to check for mail. 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. For mail destined for the internal branch network, this should be <B>svcoutside</B> (the address of the outside interface of the services BSN component). This is then forwarded to the to the internal component of the BSN for sending on to the branch network.</P>
@@ -79,56 +81,56 @@ local mailboxform = myform[tags]["value"]
 ?>
 <DL>
 <? 
-	io.write("<CENTER><TABLE STYLE='width:90%;border:1px solid #ccc;background:#eee'><TR><TD CLASS='header' WIDTH='130px'>")
-	io.write("<CENTER>METHOD</CENTER></TD><TD CLASS='header' COLSPAN=2>")
-	io.write("<CENTER>REMOTE</CENTER></TD><TD CLASS='header' COLSPAN=2>")
-	io.write("<CENTER>LOCAL</CENTER></TD></TR>")
+	io.write("\n\t<CENTER><TABLE STYLE='width:90%;border:1px solid #ccc;background:#eee'>\n\t\t<TR>\n\t\t\t<TD CLASS='header' WIDTH='130px'>")
+	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("<TR><TD>")
+		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><TD style='padding-left:".. leftpadd .. ";padding-right:".. rightpadd .. ";' WIDTH='5%'>")
+		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><TD>")
+		io.write(":</TD>\n\t\t\t<TD>")
 			io.write(html.form[mailboxform[i][val]["type"]](mailboxform[i][val]))
-		io.write("</TD><TD style='padding-left:".. leftpadd .. ";padding-right:".. rightpadd .. ";' WIDTH='5%'>")
+		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><TD>")
+		io.write(":</TD>\n\t\t\t<TD>")
 			io.write(html.form[mailboxform[i][val]["type"]](mailboxform[i][val]))
-		io.write("</TD></TR>")
-		io.write("<TR><TD>")
+		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><TD style='padding-left:".. leftpadd .. ";padding-right:".. rightpadd .. ";'>")
+		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><TD>")
+		io.write(":</TD>\n\t\t\t<TD>")
 			io.write(html.form[mailboxform[i][val]["type"]](mailboxform[i][val]))
-		io.write("</TD><TD style='padding-left:".. leftpadd .. ";padding-right:".. rightpadd .. ";'>")
+		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><TD>")
+		io.write(":</TD>\n\t\t\t<TD>")
 			io.write(html.form[mailboxform[i][val]["type"]](mailboxform[i][val]))
-		io.write("</TD></TR>")
-		io.write("<TR><TD>")
-		io.write("</TD><TD style='padding-left:".. leftpadd .. ";padding-right:".. rightpadd .. ";'>")
+		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><TD>")
+		io.write(":</TD>\n\t\t\t<TD>")
 			io.write(html.form[mailboxform[i][val]["type"]](mailboxform[i][val]))
-		io.write("</TD><TD style='padding-left:".. leftpadd .. ";padding-right:".. rightpadd .. ";'>")
+		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><TD>")
+		io.write(":</TD>\n\t\t\t<TD>")
 			io.write(html.form[mailboxform[i][val]["type"]](mailboxform[i][val]))
-		io.write("</TD></TR>")
-		io.write("<TR><TD COLSPAN=5><HR></TD></TR>")
+		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>")
 ?>
@@ -194,7 +196,7 @@ if (cmdform) and (cmdform[tags[1]]) then
 <? end ?>
 
 <?
----[[ DEBUG INFORMATION
+--[[ 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>")