* cmd_spex (): the new 'roompolicy' thing was missing here too.

[citadel.git] / citadel / modules / expire / expire_policy.c

diff --git a/citadel/modules/expire/expire_policy.c b/citadel/modules/expire/expire_policy.c
index 5bf69953c44a527d27391f023a0e926d366b8163..bc5d155d8342785cbaf2508a5a43383960dacb4a 100644 (file)
--- a/citadel/modules/expire/expire_policy.c
+++ b/citadel/modules/expire/expire_policy.c
@@ -31,11 +31,11 @@
 #include "room_ops.h"
 #include "sysdep_decls.h"
 #include "support.h"
-#include "user_ops.h"
 #include "msgbase.h"
 #include "citserver.h"
 
 #include "ctdl_module.h"
+#include "user_ops.h"
 
 /*
  * Retrieve the applicable expire policy for a specific room
@@ -85,7 +85,8 @@ void cmd_gpex(char *argbuf) {
        char which[128];
 
        extract_token(which, argbuf, 0, '|', sizeof which);
-       if (!strcasecmp(which, strof(room))) {
+       if (!strcasecmp(which, strof(roompolicy))||
+           !strcasecmp(which, "room")) { /* Deprecated version */
                memcpy(&exp, &CC->room.QRep, sizeof(struct ExpirePolicy));
        }
        else if (!strcasecmp(which, strof(floorpolicy))||
@@ -128,7 +129,8 @@ void cmd_spex(char *argbuf) {
                return;
        }
 
-       if (!strcasecmp(which, "room")) {
+       if (!strcasecmp(which, strof(roompolicy))||
+           !strcasecmp(which, "room")) {
                if (!is_room_aide()) {
                        cprintf("%d Higher access required.\n",
                                ERROR + HIGHER_ACCESS_REQUIRED);