* Finally got room chat working properly. Just need to add the bells and whistles.

[citadel.git] / citadel / policy.c

diff --git a/citadel/policy.c b/citadel/policy.c
index 079c3cda088ba90c381150201671e8d896512fff..c85383cb8842df29da52c84e1db669580cfa35f9 100644 (file)
--- a/citadel/policy.c
+++ b/citadel/policy.c
@@ -23,10 +23,10 @@
 #endif
 
 #include <limits.h>
+#include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"
 #include "database.h"
-#include "serv_extensions.h"
 #include "config.h"
 #include "room_ops.h"
 #include "sysdep_decls.h"
@@ -34,8 +34,8 @@
 #include "user_ops.h"
 #include "msgbase.h"
 #include "citserver.h"
-#include "tools.h"
 
+#include "ctdl_module.h"
 
 /*
  * Retrieve the applicable expire policy for a specific room
@@ -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;
@@ -85,17 +85,17 @@ void cmd_gpex(char *argbuf) {
        char which[128];
 
        extract_token(which, argbuf, 0, '|', sizeof which);
-       if (!strcasecmp(which, "room")) {
+       if (!strcasecmp(which, strof(room))) {
                memcpy(&exp, &CC->room.QRep, sizeof(struct ExpirePolicy));
        }
-       else if (!strcasecmp(which, "floor")) {
-               fl = cgetfloor(CC->room.QRfloor);
+       else if (!strcasecmp(which, strof(floorpolicy))) {
+               fl = CtdlGetCachedFloor(CC->room.QRfloor);
                memcpy(&exp, &fl->f_ep, sizeof(struct ExpirePolicy));
        }
-       else if (!strcasecmp(which, "mailboxes")) {
+       else if (!strcasecmp(which, strof(mailboxespolicy))) {
                memcpy(&exp, &config.c_mbxep, sizeof(struct ExpirePolicy));
        }
-       else if (!strcasecmp(which, "site")) {
+       else if (!strcasecmp(which, strof(sitepolicy))) {
                memcpy(&exp, &config.c_ep, sizeof(struct ExpirePolicy));
        }
        else {
@@ -131,20 +131,20 @@ 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;
        }
 
-       if (!strcasecmp(which, "floor")) {
+       if (!strcasecmp(which, strof(floorpolicy))) {
                lgetfloor(&flbuf, CC->room.QRfloor);
                memcpy(&flbuf.f_ep, &exp, sizeof(struct ExpirePolicy));
                lputfloor(&flbuf, CC->room.QRfloor);
@@ -152,7 +152,7 @@ void cmd_spex(char *argbuf) {
                return;
        }
 
-       else if (!strcasecmp(which, "mailboxes")) {
+       else if (!strcasecmp(which, strof(mailboxespolicy))) {
                memcpy(&config.c_mbxep, &exp, sizeof(struct ExpirePolicy));
                put_config();
                cprintf("%d Default expire policy for mailboxes set.\n",
@@ -160,7 +160,7 @@ void cmd_spex(char *argbuf) {
                return;
        }
 
-       else if (!strcasecmp(which, "site")) {
+       else if (!strcasecmp(which, strof(sitepolicy))) {
                if (exp.expire_mode == EXPIRE_NEXTLEVEL) {
                        cprintf("%d Invalid policy (no higher level)\n",
                                ERROR + ILLEGAL_VALUE);
@@ -179,4 +179,16 @@ void cmd_spex(char *argbuf) {
 
 }
 
+/*****************************************************************************/
+/*                      MODULE INITIALIZATION STUFF                          */
+/*****************************************************************************/
 
+CTDL_MODULE_INIT(policy)
+{
+       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$";
+}