Instant expunge is now the only mode of operation. The expunge semantics have been...
authorArt Cancro <ajc@uncensored.citadel.org>
Sat, 3 Aug 2013 00:10:43 +0000 (20:10 -0400)
committerArt Cancro <ajc@uncensored.citadel.org>
Sat, 3 Aug 2013 00:10:43 +0000 (20:10 -0400)
citadel/config.c
citadel/control.c
citadel/include/ctdl_module.h
citadel/modules/imap/imap_store.c
citadel/modules/migrate/serv_migrate.c
textclient/src/tuiconfig.c
webcit/siteconfig.c
webcit/static/t/aide/siteconfig/tab_imap.html

index 5328e30..4dc7698 100644 (file)
@@ -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");
index 4a09a9a..b19438b 100644 (file)
@@ -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);
index ab182b3..3cab315 100644 (file)
@@ -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;
index 959e123..5685e23 100644 (file)
@@ -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();
 }
 
 
index ddf52ae..41a2fdf 100644 (file)
@@ -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);
index ed2b953..89db731 100644 (file)
@@ -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) {
index 2454f00..ecfc0cc 100644 (file)
@@ -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")},
index 0f8a992..a064cc6 100644 (file)
@@ -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>