From cb6af686985b3d3eba6fa160ca28da43134bbf05 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Wed, 18 Jul 2012 16:37:40 +0200 Subject: [PATCH] client-move: remove duplicate tokens from webcit.h - UA_ISTRASH was there only in webcit; it was abusing the bitflag vectors undefined place. moved it one bit, added to libcitadel.h --- libcitadel/lib/libcitadel.h | 2 ++ webcit/roomops.c | 1 + webcit/webcit.h | 64 ------------------------------------- 3 files changed, 3 insertions(+), 64 deletions(-) diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h index 46b103e41..9b58553b1 100644 --- a/libcitadel/lib/libcitadel.h +++ b/libcitadel/lib/libcitadel.h @@ -754,6 +754,8 @@ extern "C" { #define UA_ADMINALLOWED 64 /* Aide or Room Aide rights exist here */ #define UA_DELETEALLOWED 128 /* User is allowed to delete messages from this room */ #define UA_REPLYALLOWED 256 /* User is allowed to reply to existing messages here */ +/* runtime flag extracted from goto reply; not db persistant, should be moved if new flags added */ +#define UA_ISTRASH 512 /* Only available in room view... */ #ifdef __cplusplus } diff --git a/webcit/roomops.c b/webcit/roomops.c index 6325a10df..0c3eaa21d 100644 --- a/webcit/roomops.c +++ b/webcit/roomops.c @@ -1369,6 +1369,7 @@ InitModule_ROOMOPS REGISTERTokenParamDefine(UA_POSTALLOWED); REGISTERTokenParamDefine(UA_ADMINALLOWED); REGISTERTokenParamDefine(UA_DELETEALLOWED); + REGISTERTokenParamDefine(UA_REPLYALLOWED); REGISTERTokenParamDefine(UA_ISTRASH); REGISTERTokenParamDefine(US_NEEDVALID); diff --git a/webcit/webcit.h b/webcit/webcit.h index d3ef29772..b34400920 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -149,70 +149,6 @@ extern char *ssl_cipher_list; #endif -/* - * Room flags (from Citadel) - * - * bucket one... - */ -#define QR_PERMANENT 1 /* Room does not purge */ -#define QR_INUSE 2 /* Set if in use, clear if avail */ -#define QR_PRIVATE 4 /* Set for any type of private room */ -#define QR_PASSWORDED 8 /* Set if there's a password too */ -#define QR_GUESSNAME 16 /* Set if it's a guessname room */ -#define QR_DIRECTORY 32 /* Directory room */ -#define QR_UPLOAD 64 /* Allowed to upload */ -#define QR_DOWNLOAD 128 /* Allowed to download */ -#define QR_VISDIR 256 /* Visible directory */ -#define QR_ANONONLY 512 /* Anonymous-Only room */ -#define QR_ANONOPT 1024 /* Anonymous-Option room */ -#define QR_NETWORK 2048 /* Shared network room */ -#define QR_PREFONLY 4096 /* Preferred status needed to enter */ -#define QR_READONLY 8192 /* Aide status required to post */ -#define QR_MAILBOX 16384 /* Set if this is a private mailbox */ - -/* - * bucket two... - */ -#define QR2_SYSTEM 1 /* System room; hide by default */ -#define QR2_SELFLIST 2 /* Self-service mailing list mgmt */ -#define QR2_COLLABDEL 4 /* Anyone who can post can also delete */ -#define QR2_SUBJECTREQ 8 /* Subject strongly recommended */ -#define QR2_SMTP_PUBLIC 16 /* smtp public postable room */ -#define QR2_MODERATED 32 /* Listservice aide has to permit posts */ - -/* - * user/room access - */ -#define UA_KNOWN 2 -#define UA_GOTOALLOWED 4 -#define UA_HASNEWMSGS 8 -#define UA_ZAPPED 16 -#define UA_POSTALLOWED 32 -#define UA_ADMINALLOWED 64 -#define UA_DELETEALLOWED 128 -#define UA_ISTRASH 256 /* Only available in room view... */ - - -/* - * User flags (from Citadel) - */ -#define US_NEEDVALID 1 /* User needs to be validated */ -#define US_PERM 4 /* Permanent user */ -#define US_LASTOLD 16 /* Print last old message with new */ -#define US_EXPERT 32 /* Experienced user */ -#define US_UNLISTED 64 /* Unlisted userlog entry */ -#define US_NOPROMPT 128 /* Don't prompt after each message */ -#define US_PROMPTCTL 256 /* ext & top work at prompt */ -#define US_DISAPPEAR 512 /* Use "disappearing msg prompts" */ -#define US_REGIS 1024 /* Registered user */ -#define US_PAGINATOR 2048 /* Pause after each screen of text */ -#define US_INTERNET 4096 /* Internet mail privileges */ -#define US_FLOORS 8192 /* User wants to see floors */ -#define US_COLOR 16384 /* User wants ANSI color support */ -#define US_USER_SET (US_LASTOLD | US_EXPERT | US_UNLISTED | \ - US_NOPROMPT | US_DISAPPEAR | US_PAGINATOR | \ - US_FLOORS | US_COLOR | US_PROMPTCTL ) - #define SRV_STATUS_MSG(ServerLineBuf) (ChrPtr(ServerLineBuf) + 4), (StrLength(ServerLineBuf) - 4) -- 2.30.2