From cc0b1be4661c56c921f667518cb477d817227d9c Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <dothebart@citadel.org>
Date: Wed, 25 Jul 2012 14:55:19 +0200
Subject: [PATCH] Siteconfig: regroup settings

---
 .../t/aide/display_sitewide_config.html       | 25 +++++---
 .../static/t/aide/siteconfig/tab_access.html  |  7 +-
 .../t/aide/siteconfig/tab_autopurger.html     |  8 +++
 webcit/static/t/aide/siteconfig/tab_imap.html | 17 +++++
 .../static/t/aide/siteconfig/tab_setting.html | 43 +++++++++++++
 .../{tab_network.html => tab_smtp.html}       | 64 +++++--------------
 .../static/t/aide/siteconfig/tab_tuning.html  | 29 ---------
 7 files changed, 104 insertions(+), 89 deletions(-)
 create mode 100644 webcit/static/t/aide/siteconfig/tab_imap.html
 create mode 100644 webcit/static/t/aide/siteconfig/tab_setting.html
 rename webcit/static/t/aide/siteconfig/{tab_network.html => tab_smtp.html} (63%)
 delete mode 100644 webcit/static/t/aide/siteconfig/tab_tuning.html

diff --git a/webcit/static/t/aide/display_sitewide_config.html b/webcit/static/t/aide/display_sitewide_config.html
index ecb646cc1..e7ae53054 100644
--- a/webcit/static/t/aide/display_sitewide_config.html
+++ b/webcit/static/t/aide/display_sitewide_config.html
@@ -8,15 +8,22 @@
 <table border="0" cellspacing="0" cellpadding="0" ><tr><td>
 <form method="post" action="siteconfig">
 <input type="hidden" name="nonce" value= '<?NONCE>'>
-<?DOTABBED(_("General"), ="aide_siteconfig_tab_general",
-	_("Access"), ="aide_siteconfig_tab_access",
-	_("Network"), ="aide_siteconfig_tab_network",
-	_("Tuning"), ="aide_siteconfig_tab_tuning",
-	_("Directory"), ="aide_siteconfig_tab_directory",
-	_("Auto-purger"), ="aide_siteconfig_tab_autopurger",
-	_("Indexing/Journaling"), ="aide_siteconfig_tab_indexing",
-	_("Push Email"), ="aide_siteconfig_tab_pushmail",
-	_("Pop3"), ="aide_siteconfig_tab_pop3", 
+<?DOTABBED(
+	_("General"),			="aide_siteconfig_tab_general",
+
+	_("Settings"),			="aide_siteconfig_tab_setting",
+	_("SMTP"),			="aide_siteconfig_tab_smtp", 
+	_("IMAP4"),			="aide_siteconfig_tab_imap", 
+	_("Pop3"),			="aide_siteconfig_tab_pop3", 
+
+	_("Push Email"),		="aide_siteconfig_tab_pushmail",
+
+	_("Indexing/Journaling"),	="aide_siteconfig_tab_indexing",
+
+	_("Access"),			="aide_siteconfig_tab_access",
+	_("Directory"),			="aide_siteconfig_tab_directory",
+	_("Auto-purger"),		="aide_siteconfig_tab_autopurger",
+
         "", ="aide_siteconfig_submit")>
 </form>
 </td></tr></table>
diff --git a/webcit/static/t/aide/siteconfig/tab_access.html b/webcit/static/t/aide/siteconfig/tab_access.html
index 4d807c259..664ba9a1d 100644
--- a/webcit/static/t/aide/siteconfig/tab_access.html
+++ b/webcit/static/t/aide/siteconfig/tab_access.html
@@ -27,6 +27,9 @@
 	<option <?%("COND:SERVCFG", 1, "c_auth_mode", 3, 'selected="selected"', "")> value="3"><?_("LDAP (Active Directory)")></option>
 </select></td></tr>
 
+<tr><td><?_("Allow anonymous guest access")></td><td>
+<input type="checkbox" NAME="c_guest_logins" VALUE="yes" <?%("COND:SERVCFG", 1, "c_guest_logins", 1, "CHECKED", "")>></td></tr>
+
 <tr><td><?_("Master user name (blank to disable)")></td><td>
 <input type="text" NAME="c_master_user" MAXLENGTH="31" VALUE='<?SERV:CFG("c_master_user")>'></td></tr>
 
@@ -74,8 +77,4 @@
 <tr><td><?_("Require registration for new users")></td><td>
 <input type="checkbox" name="c_regiscall" value="yes" <?%("COND:SERVCFG", 1, "c_regiscall", 1, "CHECKED", "")>></td></tr>
 
-<tr><td><?_("Allow anonymous guest access")></td><td>
-<input type="checkbox" NAME="c_guest_logins" VALUE="yes" <?%("COND:SERVCFG", 1, "c_guest_logins", 1, "CHECKED", "")>></td></tr>
-
-
 </table>
diff --git a/webcit/static/t/aide/siteconfig/tab_autopurger.html b/webcit/static/t/aide/siteconfig/tab_autopurger.html
index d6ddd6d07..90d5e8921 100644
--- a/webcit/static/t/aide/siteconfig/tab_autopurger.html
+++ b/webcit/static/t/aide/siteconfig/tab_autopurger.html
@@ -94,6 +94,14 @@
 <?_("Number of messages or days: ")>
 <input type="text" NAME="mailboxespolicy_value" MAXLENGTH="5" VALUE='<?EXPIRE:VALUE(#"mailboxespolicy")>'>
 </td></tr>
+<tr><td colspan=2><hr></td></tr>
+
+<tr><td><?_("Default user purge time (days)")></td><td>
+<input type="text" name="c_userpurge" maxlength="5" value='<?SERV:CFG("c_userpurge")>'></td></tr>
+
+<tr><td><?_("Default room purge time (days)")></td><td>
+<input type="text" name="c_roompurge" maxlength="5" value='<?SERV:CFG("c_roompurge")>'></td></tr>
+
 
 <tr><td COLSPAN=2><hr /></td></tr>
 
diff --git a/webcit/static/t/aide/siteconfig/tab_imap.html b/webcit/static/t/aide/siteconfig/tab_imap.html
new file mode 100644
index 000000000..0f8a9920f
--- /dev/null
+++ b/webcit/static/t/aide/siteconfig/tab_imap.html
@@ -0,0 +1,17 @@
+<div class="conftitle"><?_("IMAP")></div>
+<div class="confdescr"><?_("Changes made on this screen will not take effect until you restart the Citadel server.")></div>
+<hr>
+<table border="0">
+<tr><td><?_("IMAP listener port (-1 to disable)")></td><td>
+<input type="text" NAME="c_imap_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_imap_port")>'></td></tr>
+
+<tr><td><?_("IMAP over SSL port (-1 to disable)")></td><td>
+<input type="text" NAME="c_imaps_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_imaps_port")>'></td></tr>
+
+<tr><td><?_("Keep original from headers in IMAP")></td><td>
+<input type="checkbox" NAME="c_imap_keep_from" VALUE="yes" <?%("COND:SERVCFG", 1, "c_imap_keep_from", 1, "CHECKED", "")>></td></tr>
+
+<tr><td><?_("Instantly expunge deleted messages in IMAP")></td><td>
+<input type="checkbox" NAME="c_instant_expunge" VALUE="yes" <?%("COND:SERVCFG", 1, "c_instant_expunge", 1, "CHECKED", "")>></td></tr>
+
+</table>
diff --git a/webcit/static/t/aide/siteconfig/tab_setting.html b/webcit/static/t/aide/siteconfig/tab_setting.html
new file mode 100644
index 000000000..651fcc4b3
--- /dev/null
+++ b/webcit/static/t/aide/siteconfig/tab_setting.html
@@ -0,0 +1,43 @@
+<div class="confdescr"><?_("Changes made on this screen will not take effect until you restart the Citadel server.")></div>
+<hr>
+<table border="0">
+
+<tr><td colspan=2><div class="conftitle"><?_("Network services")></div></td></tr>
+
+<tr><td><?_("Server IP address (0.0.0.0 for 'any' IPV4, * for all including IPV6)")></td><td>
+<input type="text" NAME="c_ip_addr" MAXLENGTH="15" VALUE='<?SERV:CFG("c_ip_addr")>'></td></tr>
+
+<tr><td><?_("XMPP (Jabber) client to server port (-1 to disable)")></td><td>
+<input type="text" name="c_xmpp_c2s_port" maxlength="5" value='<?SERV:CFG("c_xmpp_c2s_port")>'></td></tr>
+
+<tr><td><?_("XMPP (Jabber) server to server port (-1 to disable)")></td><td>
+<input type="hidden" name="c_xmpp_s2s_port" value='<?SERV:CFG("c_xmpp_s2s_port")>'></td></tr>
+
+<tr><td colspan=2><div class="conftitle"><?_("Advanced server fine-tuning controls")></div></td></tr>
+
+<tr><td><?_("Maximum message length")></td><td>
+<input type="text" name="c_maxmsglen" maxlength="20" value='<?SERV:CFG("c_maxmsglen")>'></td></tr>
+
+<tr><td><?_("Server connection idle timeout (in seconds)")></td><td>
+<input type="text" name="c_sleeping" maxlength="15" value='<?SERV:CFG("c_sleeping")>'></td></tr>
+
+<tr><td><?_("Network run frequency (in seconds)")></td><td>
+<input type="text" NAME="c_net_freq" MAXLENGTH="5" VALUE='<?SERV:CFG("c_net_freq")>'></td></tr>
+
+<tr><td><?_("Maximum concurrent sessions (0 = no limit)")></td><td>
+<input type="text" name="c_maxsessions" maxlength="5" value='<?SERV:CFG("c_maxsessions")>'></td></tr>
+
+<tr><td colspan=2><hr></td></tr>
+
+<tr><td><?_("Minimum number of worker threads")></td><td>
+<input type="text" name="c_min_workers" maxlength="5" value='<?SERV:CFG("c_min_workers")>'></td></tr>
+
+<tr><td><?_("Maximum number of worker threads")></td><td>
+<input type="text" name="c_max_workers" maxlength="5" value='<?SERV:CFG("c_max_workers")>'></td></tr>
+
+<tr><td colspan=2><hr></td></tr>
+
+<tr><td><?_("Automatically delete committed database logs")></td><td>
+<input type="checkbox" NAME="c_auto_cull" VALUE="yes" <?%("COND:SERVCFG", 1, "c_auto_cull", 1, "CHECKED", "")>></td></tr>
+
+</table>
diff --git a/webcit/static/t/aide/siteconfig/tab_network.html b/webcit/static/t/aide/siteconfig/tab_smtp.html
similarity index 63%
rename from webcit/static/t/aide/siteconfig/tab_network.html
rename to webcit/static/t/aide/siteconfig/tab_smtp.html
index 3997292ec..a214ec910 100644
--- a/webcit/static/t/aide/siteconfig/tab_network.html
+++ b/webcit/static/t/aide/siteconfig/tab_smtp.html
@@ -1,11 +1,25 @@
-<div class="conftitle"><?_("Network services")></div>
+<div class="conftitle"><?_("SMTP-Servers")></div>
 <div class="confdescr"><?_("Changes made on this screen will not take effect until you restart the Citadel server.")></div>
 <hr>
 <table border="0">
-
 <tr><td><?_("SMTP MTA port (-1 to disable)")></td><td>
 <input type="text" NAME="c_smtp_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_smtp_port")>'></td></tr>
 
+<tr><td><?_("SMTP MSA port (-1 to disable)")></td><td>
+<input type="text" NAME="c_msa_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_msa_port")>'></td></tr>
+
+<tr><td><?_("SMTP over SSL port (-1 to disable)")></td><td>
+<input type="text" NAME="c_smtps_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_smtps_port")>'></td></tr>
+
+<tr><td><?_("Perform RBL checks upon connect instead of after RCPT")></td><td>
+<input type="checkbox" NAME="c_rbl_at_greeting" VALUE="yes" <?%("COND:SERVCFG", 1, "c_rbl_at_greeting", 1, "CHECKED", "")>></td></tr>
+
+<tr><td><?_("Flag message as spam, instead of rejecting it")></td><td>
+<input type="checkbox" NAME="c_spam_flag_only" VALUE="yes" <?%("COND:SERVCFG", 1, "c_spam_flag_only", 1, "CHECKED", "")>></td></tr>
+
+<tr><td><?_("Allow unauthenticated SMTP clients to spoof this sites domains")></td><td>
+<input type="checkbox" NAME="c_allow_spoofing" VALUE="yes" <?%("COND:SERVCFG", 1, "c_allow_spoofing", 1, "CHECKED", "")>></td></tr>
+
 <tr><td><?_("Correct forged From: lines during authenticated SMTP")></td><td>
 <ul>
 <li>
@@ -22,41 +36,9 @@
  <?_("If the specified email is none of the users email-aliases or missing, refuse to relay the email")>
 </li>
 </ul>
-<!--
-<input type="checkbox" NAME="c_rfc822_strict_from" VALUE="yes" <?%("COND:SERVCFG", 1, "c_rfc822_strict_from", 1, "", "CHECKED")>>
--->
 </td></tr>
 
-<tr><td><?_("Flag message as spam, instead of rejecting it")></td><td>
-<input type="checkbox" NAME="c_spam_flag_only" VALUE="yes" <?%("COND:SERVCFG", 1, "c_spam_flag_only", 1, "CHECKED", "")>></td></tr>
-
-<tr><td></td></tr>
-
-<tr><td><?_("IMAP listener port (-1 to disable)")></td><td>
-<input type="text" NAME="c_imap_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_imap_port")>'></td></tr>
-
-
-<tr><td><?_("Network run frequency (in seconds)")></td><td>
-<input type="text" NAME="c_net_freq" MAXLENGTH="5" VALUE='<?SERV:CFG("c_net_freq")>'></td></tr>
-
-<tr><td><?_("Server IP address (0.0.0.0 for 'any')")></td><td>
-<input type="text" NAME="c_ip_addr" MAXLENGTH="15" VALUE='<?SERV:CFG("c_ip_addr")>'></td></tr>
-
-<tr><td><?_("SMTP MSA port (-1 to disable)")></td><td>
-<input type="text" NAME="c_msa_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_msa_port")>'></td></tr>
-
-<tr><td><?_("IMAP over SSL port (-1 to disable)")></td><td>
-<input type="text" NAME="c_imaps_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_imaps_port")>'></td></tr>
-
-<tr><td><?_("SMTP over SSL port (-1 to disable)")></td><td>
-<input type="text" NAME="c_smtps_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_smtps_port")>'></td></tr>
-
-<tr><td><?_("Instantly expunge deleted messages in IMAP")></td><td>
-<input type="checkbox" NAME="c_instant_expunge" VALUE="yes" <?%("COND:SERVCFG", 1, "c_instant_expunge", 1, "CHECKED", "")>></td></tr>
-
-<!-- TODO: allow random quotes in strings -->
-<tr><td><?_("Allow unauthenticated SMTP clients to spoof this sites domains")></td><td>
-<input type="checkbox" NAME="c_allow_spoofing" VALUE="yes" <?%("COND:SERVCFG", 1, "c_allow_spoofing", 1, "CHECKED", "")>></td></tr>
+<tr><td colspan=2><hr></td></tr>
 
 <tr><td><a href="http://www.postfix.org/tcp_table.5.html"><?_("Postfix TCP Dictionary Port")></a>(<?_("-1 to disable")>)</td><td>
 <input type="text" NAME="c_pftcpdict_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_pftcpdict_port")>'></td></tr>
@@ -64,16 +46,4 @@
 <tr><td><?_("ManageSieve Port (-1 to disable)")></td><td>
 <input type="text" NAME="c_mgesve_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_mgesve_port")>'></td></tr>
 
-<tr><td><?_("Perform RBL checks upon connect instead of after RCPT")></td><td>
-<input type="checkbox" NAME="c_rbl_at_greeting" VALUE="yes" <?%("COND:SERVCFG", 1, "c_rbl_at_greeting", 1, "CHECKED", "")>></td></tr>
-
-<tr><td><?_("Keep original from headers in IMAP")></td><td>
-<input type="checkbox" NAME="c_imap_keep_from" VALUE="yes" <?%("COND:SERVCFG", 1, "c_imap_keep_from", 1, "CHECKED", "")>></td></tr>
-
-<tr><td><?_("XMPP (Jabber) client to server port (-1 to disable)")></td><td>
-<input type="text" name="c_xmpp_c2s_port" maxlength="5" value='<?SERV:CFG("c_xmpp_c2s_port")>'></td></tr>
-
-<tr><td><?_("XMPP (Jabber) server to server port (-1 to disable)")></td><td>
-<input type="hidden" name="c_xmpp_s2s_port" value='<?SERV:CFG("c_xmpp_s2s_port")>'></td></tr>
-
 </table>
diff --git a/webcit/static/t/aide/siteconfig/tab_tuning.html b/webcit/static/t/aide/siteconfig/tab_tuning.html
deleted file mode 100644
index 798002748..000000000
--- a/webcit/static/t/aide/siteconfig/tab_tuning.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<div class="conftitle"><?_("Advanced server fine-tuning controls")></div>
-<hr>
-<table border="0">
-
-<tr><td><?_("Server connection idle timeout (in seconds)")></td><td>
-<input type="text" name="c_sleeping" maxlength="15" value='<?SERV:CFG("c_sleeping")>'></td></tr>
-
-<tr><td><?_("Maximum concurrent sessions (0 = no limit)")></td><td>
-<input type="text" name="c_maxsessions" maxlength="5" value='<?SERV:CFG("c_maxsessions")>'></td></tr>
-
-<tr><td><?_("Default user purge time (days)")></td><td>
-<input type="text" name="c_userpurge" maxlength="5" value='<?SERV:CFG("c_userpurge")>'></td></tr>
-
-<tr><td><?_("Default room purge time (days)")></td><td>
-<input type="text" name="c_roompurge" maxlength="5" value='<?SERV:CFG("c_roompurge")>'></td></tr>
-
-<tr><td><?_("Maximum message length")></td><td>
-<input type="text" name="c_maxmsglen" maxlength="20" value='<?SERV:CFG("c_maxmsglen")>'></td></tr>
-
-<tr><td><?_("Minimum number of worker threads")></td><td>
-<input type="text" name="c_min_workers" maxlength="5" value='<?SERV:CFG("c_min_workers")>'></td></tr>
-
-<tr><td><?_("Maximum number of worker threads")></td><td>
-<input type="text" name="c_max_workers" maxlength="5" value='<?SERV:CFG("c_max_workers")>'></td></tr>
-
-<tr><td><?_("Automatically delete committed database logs")></td><td>
-<input type="checkbox" NAME="c_auto_cull" VALUE="yes" <?%("COND:SERVCFG", 1, "c_auto_cull", 1, "CHECKED", "")>></td></tr>
-
-</table>
-- 
2.30.2