* use eUsrAxlvl all over the place

[citadel.git] / citadel / policy.c

diff --git a/citadel/policy.c b/citadel/policy.c
index dd1b7994b726508ec17f85208ee383e28d3b3e72..52d3c697d894af4979a05bcac46b3bab6d4b9425 100644 (file)
--- a/citadel/policy.c
+++ b/citadel/policy.c
@@ -53,7 +53,7 @@ void GetExpirePolicy(struct ExpirePolicy *epbuf, struct ctdlroom *qrbuf) {
         * If the floor has its own policy, return it
         */
        if ( (qrbuf->QRflags & QR_MAILBOX) == 0) {
-               fl = cgetfloor(qrbuf->QRfloor);
+               fl = CtdlGetCachedFloor(qrbuf->QRfloor);
                if (fl->f_ep.expire_mode != 0) {
                        memcpy(epbuf, &fl->f_ep, sizeof(struct ExpirePolicy));
                        return;
@@ -89,7 +89,7 @@ void cmd_gpex(char *argbuf) {
                memcpy(&exp, &CC->room.QRep, sizeof(struct ExpirePolicy));
        }
        else if (!strcasecmp(which, "floor")) {
-               fl = cgetfloor(CC->room.QRfloor);
+               fl = CtdlGetCachedFloor(CC->room.QRfloor);
                memcpy(&exp, &fl->f_ep, sizeof(struct ExpirePolicy));
        }
        else if (!strcasecmp(which, "mailboxes")) {
@@ -131,14 +131,14 @@ void cmd_spex(char *argbuf) {
                                ERROR + HIGHER_ACCESS_REQUIRED);
                        return;
                }
-               lgetroom(&CC->room, CC->room.QRname);
+               CtdlGetRoomLock(&CC->room, CC->room.QRname);
                memcpy(&CC->room.QRep, &exp, sizeof(struct ExpirePolicy));
-               lputroom(&CC->room);
+               CtdlPutRoomLock(&CC->room);
                cprintf("%d Room expire policy has been updated.\n", CIT_OK);
                return;
        }
 
-       if (CC->user.axlevel < 6) {
+       if (CC->user.axlevel < AxAideU) {
                cprintf("%d Higher access required.\n",
                        ERROR + HIGHER_ACCESS_REQUIRED);
                return;
@@ -185,8 +185,10 @@ void cmd_spex(char *argbuf) {
 
 CTDL_MODULE_INIT(policy)
 {
-       CtdlRegisterProtoHook(cmd_gpex, "GPEX", "Autoconverted. TODO: document me.");
-       CtdlRegisterProtoHook(cmd_spex, "SPEX", "Autoconverted. TODO: document me.");
+       if (!threading) {
+               CtdlRegisterProtoHook(cmd_gpex, "GPEX", "Autoconverted. TODO: document me.");
+               CtdlRegisterProtoHook(cmd_spex, "SPEX", "Autoconverted. TODO: document me.");
+       }
         /* return our Subversion id for the Log */
        return "$Id$";
 }