* Allow a separate default message expire policy for mailbox rooms. The

[citadel.git] / citadel / policy.c

diff --git a/citadel/policy.c b/citadel/policy.c
index 621e7a72ad662a5469c31e86e1973209a153cdda..7ad326c3c274bf8812a9680156a66818102e238e 100644 (file)
--- a/citadel/policy.c
+++ b/citadel/policy.c
@@ -53,11 +53,26 @@ void GetExpirePolicy(struct ExpirePolicy *epbuf, struct ctdlroom *qrbuf) {
                return;
        }
 
-       /* Otherwise, if the floor has its own policy, return it */
-       fl = cgetfloor(qrbuf->QRfloor);
-       if (fl->f_ep.expire_mode != 0) {
-               memcpy(epbuf, &fl->f_ep, sizeof(struct ExpirePolicy));
-               return;
+       /* (non-mailbox rooms)
+        * If the floor has its own policy, return it
+        */
+       if ( (qrbuf->QRflags & QR_MAILBOX) == 0) {
+               fl = cgetfloor(qrbuf->QRfloor);
+               if (fl->f_ep.expire_mode != 0) {
+                       memcpy(epbuf, &fl->f_ep, sizeof(struct ExpirePolicy));
+                       return;
+               }
+       }
+
+       /* (Mailbox rooms)
+        * If there is a default policy for mailbox rooms, return it
+        */
+       if (qrbuf->QRflags & QR_MAILBOX) {
+               if (&config.c_mbxep.expire_mode != 0) {
+                       memcpy(epbuf, &config.c_mbxep,
+                               sizeof(struct ExpirePolicy));
+                       return;
+               }
        }
 
        /* Otherwise, fall back on the system default */
@@ -81,6 +96,9 @@ void cmd_gpex(char *argbuf) {
                fl = cgetfloor(CC->room.QRfloor);
                memcpy(&exp, &fl->f_ep, sizeof(struct ExpirePolicy));
        }
+       else if (!strcasecmp(which, "mailboxes")) {
+               memcpy(&exp, &config.c_mbxep, sizeof(struct ExpirePolicy));
+       }
        else if (!strcasecmp(which, "site")) {
                memcpy(&exp, &config.c_ep, sizeof(struct ExpirePolicy));
        }
@@ -138,6 +156,14 @@ void cmd_spex(char *argbuf) {
                return;
        }
 
+       else if (!strcasecmp(which, "mailboxes")) {
+               memcpy(&config.c_mbxep, &exp, sizeof(struct ExpirePolicy));
+               put_config();
+               cprintf("%d Default expire policy for mailboxes set.\n",
+                       CIT_OK);
+               return;
+       }
+
        else if (!strcasecmp(which, "site")) {
                if (exp.expire_mode == EXPIRE_NEXTLEVEL) {
                        cprintf("%d Invalid policy (no higher level)\n",