From cc944f6dccf64a3820bc4d3be5eca8ff6b4d0993 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Thu, 20 May 2004 16:14:09 +0000 Subject: [PATCH] * Changed internal version number to 6.21 * Added missing VIEW_* defines in citadel.h (they're used only by WebCit for now, which is why Citadel didn't need them, but they should be there anyway for completeness) * Removed the last vestiges of the built-in spam filter. It had been commented out, but it's definitely never coming back now, so away it goes. * Updated some of the docs --- citadel/ChangeLog | 10 +++++++++- citadel/citadel.h | 7 ++++--- citadel/citadel.lsm | 4 ++-- citadel/citadel.nsi | 2 +- citadel/citadel.spec | 2 +- citadel/serv_inetcfg.c | 10 ---------- citadel/techdoc/roadmap.txt | 2 ++ citadel/techdoc/views.txt | 2 ++ 8 files changed, 21 insertions(+), 18 deletions(-) diff --git a/citadel/ChangeLog b/citadel/ChangeLog index b9d6083a7..a535a401e 100644 --- a/citadel/ChangeLog +++ b/citadel/ChangeLog @@ -1,4 +1,13 @@ $Log$ + Revision 620.35 2004/05/20 16:14:08 ajc + * Changed internal version number to 6.21 + * Added missing VIEW_* defines in citadel.h (they're used only by WebCit + for now, which is why Citadel didn't need them, but they should be there + anyway for completeness) + * Removed the last vestiges of the built-in spam filter. It had been + commented out, but it's definitely never coming back now, so away it goes. + * Updated some of the docs + Revision 620.34 2004/05/15 14:19:52 error * Scheduler: when next_session is to be deleted, make it point to some other session which isn't being deleted (or NULL if there aren't any). @@ -5776,4 +5785,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant Fri Jul 10 1998 Art Cancro * Initial CVS import - diff --git a/citadel/citadel.h b/citadel/citadel.h index 03aa6282a..4d2466b70 100644 --- a/citadel/citadel.h +++ b/citadel/citadel.h @@ -32,7 +32,7 @@ extern "C" { /* * Text description of this software */ -#define CITADEL "Citadel/UX 6.20" +#define CITADEL "Citadel/UX 6.21" /* * REV_LEVEL is the current version number (multiplied by 100 to avoid having @@ -44,7 +44,7 @@ extern "C" { * usually more strict because you're not really supposed to dump/load and * upgrade at the same time. */ -#define REV_LEVEL 620 /* This version */ +#define REV_LEVEL 621 /* This version */ #define REV_MIN 591 /* Oldest compatible database */ #define EXPORT_REV_MIN 615 /* Oldest compatible export files */ @@ -304,7 +304,6 @@ enum { #define IGNETCFG "application/x-citadel-ignet-config" #define IGNETMAP "application/x-citadel-ignet-map" #define FILTERLIST "application/x-citadel-filter-list" -#define SPAMSTRINGS "application/x-citadel-spam-strings" #define TRACE lprintf(CTDL_DEBUG, "Checkpoint: %s, %d\n", __FILE__, __LINE__) @@ -319,6 +318,8 @@ enum { #define VIEW_BBS 0 /* Traditional Citadel BBS view */ #define VIEW_MAILBOX 1 /* Mailbox summary */ #define VIEW_ADDRESSBOOK 2 /* Address book view */ +#define VIEW_CALENDAR 3 /* Calendar view */ +#define VIEW_TASKS 4 /* Tasks view */ #ifdef __cplusplus } diff --git a/citadel/citadel.lsm b/citadel/citadel.lsm index 825d97790..baedc0c1f 100644 --- a/citadel/citadel.lsm +++ b/citadel/citadel.lsm @@ -1,7 +1,7 @@ Begin4 Title: Citadel/UX -Version: 6.20p1 -Entered-date: Mon Apr 12 13:31:22 CDT 2004 +Version: 6.21 +Entered-date: Thu May 20 12:10:30 EDT 2004 Description: The Citadel/UX messaging platform for Unix systems. In addition to BBS functionality, Citadel/UX also offers advanced messaging and groupware applications, including Internet e-mail diff --git a/citadel/citadel.nsi b/citadel/citadel.nsi index 8f71c66de..e0cac017f 100644 --- a/citadel/citadel.nsi +++ b/citadel/citadel.nsi @@ -4,7 +4,7 @@ !include "${NSISDIR}\Contrib\Modern UI\System.nsh" !define MUI_PRODUCT "Citadel/UX" -!define MUI_VERSION "6.20" +!define MUI_VERSION "6.21" !define MUI_WELCOMEPAGE !define MUI_LICENSEPAGE !define MUI_COMPONENTSPAGE diff --git a/citadel/citadel.spec b/citadel/citadel.spec index c819773ef..ffaff3d3c 100644 --- a/citadel/citadel.spec +++ b/citadel/citadel.spec @@ -1,7 +1,7 @@ # $Id$ Summary: Citadel/UX, the flexible, powerful way to build online communities Name: citadel -Version: 6.20p1 +Version: 6.21 Release: 3 Copyright: GPL Group: Applications/Communications diff --git a/citadel/serv_inetcfg.c b/citadel/serv_inetcfg.c index 877b2fb2c..af7f35dfb 100644 --- a/citadel/serv_inetcfg.c +++ b/citadel/serv_inetcfg.c @@ -129,12 +129,6 @@ int inetcfg_aftersave(struct CtdlMessage *msg) { strlen(INTERNETCFG))) { inetcfg_setTo(msg); /* changing configs */ } -#ifdef ___NOT_CURRENTLY_IN_USE___ - if (!strncasecmp(&ptr[14], SPAMSTRINGS, - strlen(INTERNETCFG))) { - spamstrings_setTo(msg); /* changing configs */ - } -#endif } ptr = strchr((char *)ptr, '\n'); @@ -173,10 +167,6 @@ void inetcfg_init(void) { if (getroom(&CC->room, SYSCONFIGROOM) != 0) return; CtdlForEachMessage(MSGS_LAST, 1, INTERNETCFG, NULL, inetcfg_init_backend, NULL); -/* - CtdlForEachMessage(MSGS_LAST, 1, SPAMSTRINGS, NULL, - spamstrings_init_backend, NULL); - */ } diff --git a/citadel/techdoc/roadmap.txt b/citadel/techdoc/roadmap.txt index eba6863c2..9484f6d1a 100644 --- a/citadel/techdoc/roadmap.txt +++ b/citadel/techdoc/roadmap.txt @@ -46,6 +46,8 @@ Goals to achieve during the 6.xx cycle using HTTPS.) * RFC 2739 compliance (provide calendar free/busy URL's in vCard and LDAP) + (Status: DONE. If anyone knows of any client software that makes good use + of this, please let us know and/or help test it) * Reminder: after the next non-beta version of the Citadel server is released, email the IMAPcopy people for inclusion on their web site. diff --git a/citadel/techdoc/views.txt b/citadel/techdoc/views.txt index e4e52855f..ee2aa5de2 100644 --- a/citadel/techdoc/views.txt +++ b/citadel/techdoc/views.txt @@ -23,4 +23,6 @@ is in the room record as room.QRdefaultview (and is also an integer). #define VIEW_BBS 0 /* Traditional Citadel BBS view */ #define VIEW_MAILBOX 1 /* Mailbox summary */ #define VIEW_ADDRESSBOOK 2 /* Address book view */ +#define VIEW_CALENDAR 3 /* Calendar view */ +#define VIEW_TASKS 4 /* Tasks view */ -- 2.39.2