Instant expunge is now the only mode of operation. The expunge semantics have been...

diff --git a/citadel/config.c b/citadel/config.c
index 5328e30369149a50d2c04939d0c6469b1557a17f..4dc7698b45ec6420f1e385c54c48b4882a8adcd0 100644 (file)
--- a/citadel/config.c
+++ b/citadel/config.c
@@ -61,7 +61,6 @@ void brand_new_installation_set_defaults(void) {
        safestrncpy(config.c_aideroom, "Aide", sizeof config.c_aideroom);
        config.c_port_number = 504;
        config.c_sleeping = 900;
-       config.c_instant_expunge = 1;
 
        if (config.c_ctdluid == 0) {
                pw = getpwnam("citadel");

diff --git a/citadel/control.c b/citadel/control.c
index 4a09a9adc3baaa11fa95b0bf9eaf02dca56d4327..b19438bdec36f8f7975d23388fad8308179fe117 100644 (file)
--- a/citadel/control.c
+++ b/citadel/control.c
@@ -392,7 +392,7 @@ void cmd_conf(char *argbuf)
                cprintf("%d\n", config.c_smtps_port);
                cprintf("%d\n", config.c_enable_fulltext);
                cprintf("%d\n", config.c_auto_cull);
-               cprintf("%d\n", config.c_instant_expunge);
+               cprintf("1\n");
                cprintf("%d\n", config.c_allow_spoofing);
                cprintf("%d\n", config.c_journal_email);
                cprintf("%d\n", config.c_journal_pubmsgs);
@@ -599,7 +599,7 @@ void cmd_conf(char *argbuf)
                                config.c_auto_cull = atoi(buf);
                                break;
                        case 44:
-                               config.c_instant_expunge = atoi(buf);
+                               /* niu */
                                break;
                        case 45:
                                config.c_allow_spoofing = atoi(buf);

diff --git a/citadel/include/ctdl_module.h b/citadel/include/ctdl_module.h
index ab182b3627ce7f8ca74bc3883483f6fd490b069e..3cab315e19a02e9e49e9d895655a217c12eba27a 100644 (file)
--- a/citadel/include/ctdl_module.h
+++ b/citadel/include/ctdl_module.h
@@ -365,7 +365,7 @@ struct config {
        int c_pop3s_port;
        int c_smtps_port;
        char c_auto_cull;
-       char c_instant_expunge;
+       char c_niu_5;
        char c_allow_spoofing;
        char c_journal_email;
        char c_journal_pubmsgs;

diff --git a/citadel/modules/imap/imap_store.c b/citadel/modules/imap/imap_store.c
index 959e1235d783391abf8f6758fd872fccf82f55fb..5685e239225f39a05c5ec8a73cc2e18721e32619 100644 (file)
--- a/citadel/modules/imap/imap_store.c
+++ b/citadel/modules/imap/imap_store.c
@@ -195,14 +195,8 @@ void imap_do_store(citimap_command *Cmd) {
        }
 
        free(ss_msglist);
-
-       /*
-        * The following two commands implement "instant expunge" if enabled.
-        */
-       if (config.c_instant_expunge) {
-               imap_do_expunge();
-               imap_rescan_msgids();
-       }
+       imap_do_expunge();              // Citadel always expunges immediately.
+       imap_rescan_msgids();
 }
 
 

diff --git a/citadel/modules/migrate/serv_migrate.c b/citadel/modules/migrate/serv_migrate.c
index ddf52aeea170e40116d9ba22c7859289dda8aede..41a2fdf2497d3dc323e078292367069e235eaca0 100644 (file)
--- a/citadel/modules/migrate/serv_migrate.c
+++ b/citadel/modules/migrate/serv_migrate.c
@@ -442,7 +442,6 @@ void migr_do_export(void) {
        cprintf("<c_pop3s_port>%d</c_pop3s_port>\n", config.c_pop3s_port);
        cprintf("<c_smtps_port>%d</c_smtps_port>\n", config.c_smtps_port);
        cprintf("<c_auto_cull>%d</c_auto_cull>\n", config.c_auto_cull);
-       cprintf("<c_instant_expunge>%d</c_instant_expunge>\n", config.c_instant_expunge);
        cprintf("<c_allow_spoofing>%d</c_allow_spoofing>\n", config.c_allow_spoofing);
        cprintf("<c_journal_email>%d</c_journal_email>\n", config.c_journal_email);
        cprintf("<c_journal_pubmsgs>%d</c_journal_pubmsgs>\n", config.c_journal_pubmsgs);
@@ -676,7 +675,6 @@ void migr_xml_end(void *data, const char *el) {
        else if (!strcasecmp(el, "c_pop3s_port"))               config.c_pop3s_port = atoi(migr_chardata);
        else if (!strcasecmp(el, "c_smtps_port"))               config.c_smtps_port = atoi(migr_chardata);
        else if (!strcasecmp(el, "c_auto_cull"))                config.c_auto_cull = atoi(migr_chardata);
-       else if (!strcasecmp(el, "c_instant_expunge"))          config.c_instant_expunge = atoi(migr_chardata);
        else if (!strcasecmp(el, "c_allow_spoofing"))           config.c_allow_spoofing = atoi(migr_chardata);
        else if (!strcasecmp(el, "c_journal_email"))            config.c_journal_email = atoi(migr_chardata);
        else if (!strcasecmp(el, "c_journal_pubmsgs"))          config.c_journal_pubmsgs = atoi(migr_chardata);

diff --git a/textclient/src/tuiconfig.c b/textclient/src/tuiconfig.c
index ed2b953c4a5ae2dca13d67e75d2ea650b1b80e3f..89db7316334b98f3b3337e1ed872aad28415883b 100644 (file)
--- a/textclient/src/tuiconfig.c
+++ b/textclient/src/tuiconfig.c
@@ -221,9 +221,6 @@ void do_system_configuration(CtdlIPC *ipc)
        snprintf(sc[57], sizeof sc[57], "%d", (boolprompt(
                "Perform RBL checks at greeting instead of after RCPT",
                atoi(&sc[57][0]))));
-       snprintf(sc[44], sizeof sc[44], "%d", (boolprompt(
-               "Instantly expunge deleted IMAP messages",
-               atoi(&sc[44][0]))));
 
        /* LDAP settings */
        if (ipc->ServInfo.supports_ldap) {

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index 2454f00d8187e94dcea4d36c15c565353ed17a16..ecfc0cc6575dd062b69e97ee2a13833fab039736 100644 (file)
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -187,7 +187,7 @@ CfgMapping ServerConfig[] = {
        {CFG_STR, 0, 0, "", HKEY("c_smtps_port")},
        {CFG_YES, 0, 0, "", HKEY("c_enable_fulltext")},
        {CFG_YES, 0, 0, "", HKEY("c_auto_cull")},
-       {CFG_YES, 0, 0, "", HKEY("c_instant_expunge")},
+       {CFG_YES, 0, 0, "", HKEY("reserved3")},
        {CFG_YES, 0, 0, "", HKEY("c_allow_spoofing")},
        {CFG_YES, 0, 0, "", HKEY("c_journal_email")},
        {CFG_YES, 0, 0, "", HKEY("c_journal_pubmsgs")},

diff --git a/webcit/static/t/aide/siteconfig/tab_imap.html b/webcit/static/t/aide/siteconfig/tab_imap.html
index 0f8a9920f57e97ee595d8d3b77e9df460f11f1d0..a064cc67f4cb389f0018bcbb2332ba464117b632 100644 (file)
--- a/webcit/static/t/aide/siteconfig/tab_imap.html
+++ b/webcit/static/t/aide/siteconfig/tab_imap.html
@@ -11,7 +11,4 @@
 <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>