* 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

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index b9d6083a7671879c6ce8a700a12e8375b3a0a450..a535a401ed367832211470c161d838c6179617b0 100644 (file)
--- 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 <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/citadel.h b/citadel/citadel.h
index 03aa6282af0b6700e67f38c28d189ed803240446..4d2466b709c8c9c2c7d21b263beb03c82249b2d5 100644 (file)
--- 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 825d97790f70856bb2e6638d15fbcad1cc440c7f..baedc0c1f2293148bd4fc76677031ee1bacf627a 100644 (file)
--- 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 8f71c66de57b10e451b2f2cb3d2a762137740742..e0cac017ffce761653514253affda14c18d47349 100644 (file)
--- 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 c819773ef4f15904e13fa3068b9137640cc22199..ffaff3d3c903927135065cac59871e3580fa383c 100644 (file)
--- 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 877b2fb2c6299ed36d8e5a31f194e1f81a0ee240..af7f35dfbe4602e3e482623b51d30d611095af4a 100644 (file)
--- 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 eba6863c2f2d05c21e61c08b9c008af83f92543e..9484f6d1ae43c7c8b68200003b06e2b42888257d 100644 (file)
--- 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 e4e52855ff6be88f240269886e99986823b1a930..ee2aa5de2ef9836e0c14f5f3babbba15bf024c3d 100644 (file)
--- 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 */