projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a7ba552
)
serv_expire.c migrated to new config system
author
Art Cancro
<ajc@uncensored.citadel.org>
Sat, 2 May 2015 16:24:13 +0000
(12:24 -0400)
committer
Art Cancro
<ajc@uncensored.citadel.org>
Sat, 2 May 2015 16:24:13 +0000
(12:24 -0400)
citadel/modules/expire/expire_policy.c
patch
|
blob
|
history
diff --git
a/citadel/modules/expire/expire_policy.c
b/citadel/modules/expire/expire_policy.c
index f3b27df7f9d82786299f1ad6490eadbb1835b4eb..76c6acb44a2a3ed10605da80491fefc41756bd03 100644
(file)
--- a/
citadel/modules/expire/expire_policy.c
+++ b/
citadel/modules/expire/expire_policy.c
@@
-40,7
+40,6
@@
#include "support.h"
#include "msgbase.h"
#include "citserver.h"
#include "support.h"
#include "msgbase.h"
#include "citserver.h"
-#include "config.h"
#include "ctdl_module.h"
#include "user_ops.h"
#include "ctdl_module.h"
#include "user_ops.h"
@@
-71,14
+70,16
@@
void GetExpirePolicy(struct ExpirePolicy *epbuf, struct ctdlroom *qrbuf) {
* If there is a default policy for mailbox rooms, return it
*/
if (qrbuf->QRflags & QR_MAILBOX) {
* 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));
+ if (CtdlGetConfigInt("c_mbxep_mode") != 0) {
+ epbuf->expire_mode = CtdlGetConfigInt("c_mbxep_mode");
+ epbuf->expire_value = CtdlGetConfigInt("c_mbxep_value");
return;
}
}
/* Otherwise, fall back on the system default */
return;
}
}
/* Otherwise, fall back on the system default */
- memcpy(epbuf, &config.c_ep, sizeof(struct ExpirePolicy));
+ epbuf->expire_mode = CtdlGetConfigInt("c_ep_mode");
+ epbuf->expire_value = CtdlGetConfigInt("c_ep_value");
}
}
@@
-90,23
+91,22
@@
void cmd_gpex(char *argbuf) {
struct floor *fl;
char which[128];
struct floor *fl;
char which[128];
+ memset(&exp, 0, sizeof(struct ExpirePolicy));
extract_token(which, argbuf, 0, '|', sizeof which);
extract_token(which, argbuf, 0, '|', sizeof which);
- if (!strcasecmp(which, strof(roompolicy))||
- !strcasecmp(which, "room")) { /* Deprecated version */
+ if (!strcasecmp(which, strof(roompolicy)) || !strcasecmp(which, "room")) {
memcpy(&exp, &CC->room.QRep, sizeof(struct ExpirePolicy));
}
memcpy(&exp, &CC->room.QRep, sizeof(struct ExpirePolicy));
}
- else if (!strcasecmp(which, strof(floorpolicy))||
- !strcasecmp(which, "floor")) { /* Deprecated version */
+ else if (!strcasecmp(which, strof(floorpolicy)) || !strcasecmp(which, "floor")) {
fl = CtdlGetCachedFloor(CC->room.QRfloor);
memcpy(&exp, &fl->f_ep, sizeof(struct ExpirePolicy));
}
fl = CtdlGetCachedFloor(CC->room.QRfloor);
memcpy(&exp, &fl->f_ep, sizeof(struct ExpirePolicy));
}
- else if (!strcasecmp(which, strof(mailboxespolicy))
||
- !strcasecmp(which, "mailboxes")) {/* Deprecated version */
-
memcpy(&exp, &config.c_mbxep, sizeof(struct ExpirePolicy)
);
+ else if (!strcasecmp(which, strof(mailboxespolicy))
|| !strcasecmp(which, "mailboxes")) {
+ exp.expire_mode = CtdlGetConfigInt("c_mbxep_mode");
+
exp.expire_value = CtdlGetConfigInt("c_mbxep_value"
);
}
}
- else if (!strcasecmp(which, strof(sitepolicy))
||
- !strcasecmp(which, "site")) {/* Deprecated version */
-
memcpy(&exp, &config.c_ep, sizeof(struct ExpirePolicy)
);
+ else if (!strcasecmp(which, strof(sitepolicy))
|| !strcasecmp(which, "site")) {
+ exp.expire_mode = CtdlGetConfigInt("c_ep_mode");
+
exp.expire_value = CtdlGetConfigInt("c_ep_value"
);
}
else {
cprintf("%d Invalid keyword \"%s\"\n", ERROR + ILLEGAL_VALUE, which);
}
else {
cprintf("%d Invalid keyword \"%s\"\n", ERROR + ILLEGAL_VALUE, which);
@@
-135,9
+135,8
@@
void cmd_spex(char *argbuf) {
return;
}
return;
}
- if ( (!strcasecmp(which, strof(roompolicy)))
- || (!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);
return;
if (!is_room_aide()) {
cprintf("%d Higher access required.\n", ERROR + HIGHER_ACCESS_REQUIRED);
return;
@@
-159,9
+158,8
@@
void cmd_spex(char *argbuf) {
return;
}
return;
}
- if ( (!strcasecmp(which, strof(floorpolicy)))
- || (!strcasecmp(which, "floor"))
- ) {
+ if ((!strcasecmp(which, strof(floorpolicy))) || (!strcasecmp(which, "floor")))
+ {
lgetfloor(&flbuf, CC->room.QRfloor);
memcpy(&flbuf.f_ep, &exp, sizeof(struct ExpirePolicy));
lputfloor(&flbuf, CC->room.QRfloor);
lgetfloor(&flbuf, CC->room.QRfloor);
memcpy(&flbuf.f_ep, &exp, sizeof(struct ExpirePolicy));
lputfloor(&flbuf, CC->room.QRfloor);
@@
-169,25
+167,22
@@
void cmd_spex(char *argbuf) {
return;
}
return;
}
- else if ( (!strcasecmp(which, strof(mailboxespolicy)))
- || (!strcasecmp(which, "mailboxes"))
- ) {
- memcpy(&config.c_mbxep, &exp, sizeof(struct ExpirePolicy));
- put_config();
+ else if ((!strcasecmp(which, strof(mailboxespolicy))) || (!strcasecmp(which, "mailboxes")))
+ {
+ CtdlSetConfigInt("c_mbxep_mode", exp.expire_mode);
+ CtdlSetConfigInt("c_mbxep_value", exp.expire_value);
cprintf("%d Default expire policy for mailboxes set.\n", CIT_OK);
return;
}
cprintf("%d Default expire policy for mailboxes set.\n", CIT_OK);
return;
}
- else if ( (!strcasecmp(which, strof(sitepolicy)))
- || (!strcasecmp(which, "site"))
- ) {
+ else if ((!strcasecmp(which, strof(sitepolicy))) || (!strcasecmp(which, "site")))
+ {
if (exp.expire_mode == EXPIRE_NEXTLEVEL) {
if (exp.expire_mode == EXPIRE_NEXTLEVEL) {
- cprintf("%d Invalid policy (no higher level)\n",
- ERROR + ILLEGAL_VALUE);
+ cprintf("%d Invalid policy (no higher level)\n", ERROR + ILLEGAL_VALUE);
return;
}
return;
}
-
memcpy(&config.c_ep, &exp, sizeof(struct ExpirePolicy)
);
-
put_config(
);
+
CtdlSetConfigInt("c_ep_mode", exp.expire_mode
);
+
CtdlSetConfigInt("c_ep_value", exp.expire_value
);
cprintf("%d Site expire policy has been updated.\n", CIT_OK);
return;
}
cprintf("%d Site expire policy has been updated.\n", CIT_OK);
return;
}