* Renamed "struct user" to "struct ctdluser"

[citadel.git] / citadel / policy.c

diff --git a/citadel/policy.c b/citadel/policy.c
index 7c51fd0b6da65b37b3a1e1a2cdb465e79e8d7a90..621e7a72ad662a5469c31e86e1973209a153cdda 100644 (file)
--- a/citadel/policy.c
+++ b/citadel/policy.c
@@ -4,17 +4,33 @@
  * Functions which manage policy for rooms (such as message expiry)
  */
 
+#ifdef DLL_EXPORT
+#define IN_LIBCIT
+#endif
+
 #include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/stat.h>
 #include <string.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <limits.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"
@@ -28,7 +44,7 @@
 /*
  * Retrieve the applicable expire policy for a specific room
  */
-void GetExpirePolicy(struct ExpirePolicy *epbuf, struct quickroom *qrbuf) {
+void GetExpirePolicy(struct ExpirePolicy *epbuf, struct ctdlroom *qrbuf) {
        struct floor *fl;
 
        /* If the room has its own policy, return it */ 
@@ -59,21 +75,21 @@ void cmd_gpex(char *argbuf) {
 
        extract(which, argbuf, 0);
        if (!strcasecmp(which, "room")) {
-               memcpy(&exp, &CC->quickroom.QRep, sizeof(struct ExpirePolicy));
+               memcpy(&exp, &CC->room.QRep, sizeof(struct ExpirePolicy));
        }
        else if (!strcasecmp(which, "floor")) {
-               fl = cgetfloor(CC->quickroom.QRfloor);
+               fl = cgetfloor(CC->room.QRfloor);
                memcpy(&exp, &fl->f_ep, sizeof(struct ExpirePolicy));
        }
        else if (!strcasecmp(which, "site")) {
                memcpy(&exp, &config.c_ep, sizeof(struct ExpirePolicy));
        }
        else {
-               cprintf("%d Invalid keyword.\n", ERROR);
+               cprintf("%d Invalid keyword \"%s\"\n", ERROR, which);
                return;
        }
 
-       cprintf("%d %d|%d\n", OK, exp.expire_mode, exp.expire_value);
+       cprintf("%d %d|%d\n", CIT_OK, exp.expire_mode, exp.expire_value);
 }
 
 
@@ -101,24 +117,24 @@ void cmd_spex(char *argbuf) {
                                ERROR+HIGHER_ACCESS_REQUIRED);
                        return;
                }
-               lgetroom(&CC->quickroom, CC->quickroom.QRname);
-               memcpy(&CC->quickroom.QRep, &exp, sizeof(struct ExpirePolicy));
-               lputroom(&CC->quickroom);
-               cprintf("%d Room expire policy set.\n", OK);
+               lgetroom(&CC->room, CC->room.QRname);
+               memcpy(&CC->room.QRep, &exp, sizeof(struct ExpirePolicy));
+               lputroom(&CC->room);
+               cprintf("%d Room expire policy set.\n", CIT_OK);
                return;
        }
 
-       if (CC->usersupp.axlevel < 6) {
+       if (CC->user.axlevel < 6) {
                cprintf("%d Higher access required.\n",
                        ERROR+HIGHER_ACCESS_REQUIRED);
                return;
        }
 
        if (!strcasecmp(which, "floor")) {
-               lgetfloor(&flbuf, CC->quickroom.QRfloor);
+               lgetfloor(&flbuf, CC->room.QRfloor);
                memcpy(&flbuf.f_ep, &exp, sizeof(struct ExpirePolicy));
-               lputfloor(&flbuf, CC->quickroom.QRfloor);
-               cprintf("%d Floor expire policy set.\n", OK);
+               lputfloor(&flbuf, CC->room.QRfloor);
+               cprintf("%d Floor expire policy set.\n", CIT_OK);
                return;
        }
 
@@ -130,12 +146,12 @@ void cmd_spex(char *argbuf) {
                }
                memcpy(&config.c_ep, &exp, sizeof(struct ExpirePolicy));
                put_config();
-               cprintf("%d Site expire policy set.\n", OK);
+               cprintf("%d Site expire policy set.\n", CIT_OK);
                return;
        }
 
        else {
-               cprintf("%d Invalid keyword.\n", ERROR);
+               cprintf("%d Invalid keyword \"%s\"\n", ERROR, which);
                return;
        }