* Finished: when saving an object of type text/calendar to the Calendar> room,

  set the Citadel "extended message ID" to the UID of the VEVENT object.  This
  causes the message base to automatically delete any existing instance(s) of
  that object: automatic replacement.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index f9d3698518e7c62ff949e73e9cfdef54ed3ed301..fe5cf67cf904f272a232a3e60902d136599b8a55 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,10 @@
  $Log$
+ Revision 601.46  2002/10/23 03:55:21  ajc
+ * Finished: when saving an object of type text/calendar to the Calendar> room,
+   set the Citadel "extended message ID" to the UID of the VEVENT object.  This
+   causes the message base to automatically delete any existing instance(s) of
+   that object: automatic replacement.
+
  Revision 601.45  2002/10/23 03:07:43  ajc
  * First hack at UID-to-EMSGID mapping (for auto replacement)
 
@@ -4138,4 +4144,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/serv_calendar.c b/citadel/serv_calendar.c
index d52fe7facbf6f98ae766216a8f87badb1a72f916..c28d5e8aa1488ea70cfe79563ed0110aeff59cf6 100644 (file)
--- a/citadel/serv_calendar.c
+++ b/citadel/serv_calendar.c
@@ -556,8 +556,9 @@ int ical_obj_beforesave(struct CtdlMessage *msg)
 
        /* First determine if this is our room */
        MailboxName(roomname, sizeof roomname, &CC->usersupp, USERCALENDARROOM);
-       if (strncmp(roomname, msg->cm_fields['O'], ROOMNAMELEN))
-               return 0;       /* It's not us... */
+       if (strcasecmp(roomname, CC->quickroom.QRname)) {
+               return 0;       /* It's not the Calendar room. */
+       }
 
        /* Then determine content-type of the message */
        
@@ -571,7 +572,7 @@ int ical_obj_beforesave(struct CtdlMessage *msg)
        a = strlen(p);
        while (--a > 0) {
                if (!strncasecmp(p, "Content-Type: ", 14)) {    /* Found it */
-                       if (!strncasecmp(p + 14, "text/calendar", 15)) {
+                       if (!strncasecmp(p + 14, "text/calendar", 13)) {
                                strcpy(eidbuf, "");
                                mime_parser(msg->cm_fields['M'],
                                        NULL,