From d4d93763e3c4a82a27b719e1c944adbdc5b91cdb Mon Sep 17 00:00:00 2001 From: Rocco Rutte Date: Tue, 15 Aug 2006 17:08:32 +0000 Subject: Generic ACL support. --- flags.c | 48 ++++++++++++------------------------------------ 1 file changed, 12 insertions(+), 36 deletions(-) (limited to 'flags.c') diff --git a/flags.c b/flags.c index 9e0acc70..6d49c7bd 100644 --- a/flags.c +++ b/flags.c @@ -43,12 +43,8 @@ void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx) { case M_DELETE: -#ifdef USE_IMAP - if (ctx && ctx->magic == M_IMAP) - if (mutt_bit_isset (((IMAP_DATA *)ctx->data)->capabilities, ACL) \ - && !mutt_bit_isset(((IMAP_DATA *)ctx->data)->rights,IMAP_ACL_DELETE)) - return; -#endif + if (!mutt_bit_isset(ctx->rights,M_ACL_DELETE)) + return; if (bf) { @@ -94,12 +90,8 @@ void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx) case M_NEW: -#ifdef USE_IMAP - if (ctx && ctx->magic == M_IMAP) - if (mutt_bit_isset (((IMAP_DATA *)ctx->data)->capabilities, ACL) \ - && !mutt_bit_isset(((IMAP_DATA *)ctx->data)->rights,IMAP_ACL_SEEN)) - return; -#endif + if (!mutt_bit_isset(ctx->rights,M_ACL_SEEN)) + return; if (bf) { @@ -129,12 +121,8 @@ void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx) case M_OLD: -#ifdef USE_IMAP - if (ctx && ctx->magic == M_IMAP) - if (mutt_bit_isset (((IMAP_DATA *)ctx->data)->capabilities, ACL) \ - && !mutt_bit_isset(((IMAP_DATA *)ctx->data)->rights,IMAP_ACL_SEEN)) - return; -#endif + if (!mutt_bit_isset(ctx->rights,M_ACL_SEEN)) + return; if (bf) { @@ -159,12 +147,8 @@ void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx) case M_READ: -#ifdef USE_IMAP - if (ctx && ctx->magic == M_IMAP) - if (mutt_bit_isset (((IMAP_DATA *)ctx->data)->capabilities, ACL) \ - && !mutt_bit_isset(((IMAP_DATA *)ctx->data)->rights,IMAP_ACL_SEEN)) - return; -#endif + if (!mutt_bit_isset(ctx->rights,M_ACL_SEEN)) + return; if (bf) { @@ -191,12 +175,8 @@ void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx) case M_REPLIED: -#ifdef USE_IMAP - if (ctx && ctx->magic == M_IMAP) - if (mutt_bit_isset (((IMAP_DATA *)ctx->data)->capabilities, ACL) \ - && !mutt_bit_isset(((IMAP_DATA *)ctx->data)->rights,IMAP_ACL_WRITE)) - return; -#endif + if (!mutt_bit_isset(ctx->rights,M_ACL_WRITE)) + return; if (bf) { @@ -224,12 +204,8 @@ void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx) case M_FLAG: -#ifdef USE_IMAP - if (ctx && ctx->magic == M_IMAP) - if (mutt_bit_isset (((IMAP_DATA *)ctx->data)->capabilities, ACL) \ - && !mutt_bit_isset(((IMAP_DATA *)ctx->data)->rights,IMAP_ACL_WRITE)) - return; -#endif + if (!mutt_bit_isset(ctx->rights,M_ACL_WRITE)) + return; if (bf) { -- cgit v1.2.3