Removed the logging facility from citserver, use syslog instead

[citadel.git] / citadel / modules / notes / serv_notes.c

diff --git a/citadel/modules/notes/serv_notes.c b/citadel/modules/notes/serv_notes.c
index c7a613c044ab3a1a704b2c8d21d83404c28a88c7..db8474b1ace28dd9604369e92143ec002bace775 100644 (file)
--- a/citadel/modules/notes/serv_notes.c
+++ b/citadel/modules/notes/serv_notes.c
@@ -1,8 +1,21 @@
 /*
- * $Id$
- *
  * Handles functions related to yellow sticky notes.
  *
+ * Copyright (c) 2007-2009 by the citadel.org team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "sysdep.h"
@@ -35,28 +48,44 @@
 #include "citserver.h"
 #include "support.h"
 #include "config.h"
-#include "room_ops.h"
 #include "user_ops.h"
-#include "policy.h"
 #include "database.h"
 #include "msgbase.h"
 
 #include "ctdl_module.h"
 
 
+/*
+ * Callback function for serv_notes_beforesave() hunts for a vNote in the MIME structure
+ */
+void notes_extract_vnote(char *name, char *filename, char *partnum, char *disp,
+                  void *content, char *cbtype, char *cbcharset, size_t length,
+                  char *encoding, char *cbid, void *cbuserdata)
+{
+       struct vnote **v = (struct vnote **) cbuserdata;
+
+       if (!strcasecmp(cbtype, "text/vnote")) {
+
+               syslog(LOG_DEBUG, "Part %s contains a vNote!  Loading...\n", partnum);
+               if (*v != NULL) {
+                       vnote_free(*v);
+               }
+               *v = vnote_new_from_str(content);
+       }
+}
+
 
 /*
- * If we are in a "notes" view room, and the client has sent an RFC822
- * message containing an X-KOrg-Note-Id: field (Aethera does this, as
- * do some Kolab clients) then set both the Subject and the Exclusive ID
- * of the message to that.  It's going to be a UUID so we want to replace
- * any existing message containing that UUID.
+ * Before-save hook searches for two different types of notes (legacy Kolab/Aethera notes
+ * and modern vNote format notes) and does its best to learn the subject (summary)
+ * and EUID (uid) of the note for Citadel's own nefarious purposes.
  */
 int serv_notes_beforesave(struct CtdlMessage *msg)
 {
        char *p;
        int a, i;
-       char uuid[SIZ];
+       char uuid[512];
+       struct vnote *v = NULL;
 
        /* First determine if this room has the "notes" view set */
 
@@ -69,7 +98,13 @@ int serv_notes_beforesave(struct CtdlMessage *msg)
                return(0);      /* You tried to save a non-RFC822 message! */
        }
        
-       /* Find the X-KOrg-Note-Id: header */
+       /*
+        * If we are in a "notes" view room, and the client has sent an RFC822
+        * message containing an X-KOrg-Note-Id: field (Aethera does this, as
+        * do some Kolab clients) then set both the Subject and the Exclusive ID
+        * of the message to that.  It's going to be a UUID so we want to replace
+        * any existing message containing that UUID.
+        */
        strcpy(uuid, "");
        p = msg->cm_fields['M'];
        a = strlen(p);
@@ -83,7 +118,7 @@ int serv_notes_beforesave(struct CtdlMessage *msg)
                                }
                        }
 
-                       lprintf(9, "UUID of note is: %s\n", uuid);
+                       syslog(LOG_DEBUG, "UUID of note is: %s\n", uuid);
                        if (!IsEmptyStr(uuid)) {
 
                                if (msg->cm_fields['E'] != NULL) {
@@ -99,6 +134,42 @@ int serv_notes_beforesave(struct CtdlMessage *msg)
                }
                p++;
        }
+
+       /* Modern clients are using vNote format.  Check for one... */
+
+       mime_parser(msg->cm_fields['M'],
+               NULL,
+               *notes_extract_vnote,
+               NULL, NULL,
+               &v,             /* user data ptr - put the vnote here */
+               0
+       );
+
+       if (v == NULL) return(0);       /* no vNotes were found in this message */
+
+       /* Set the message EUID to the vNote UID */
+
+       if (v->uid) if (!IsEmptyStr(v->uid)) {
+               syslog(LOG_DEBUG, "UID of vNote is: %s\n", v->uid);
+               if (msg->cm_fields['E'] != NULL) {
+                       free(msg->cm_fields['E']);
+               }
+               msg->cm_fields['E'] = strdup(v->uid);
+       }
+
+       /* Set the message Subject to the vNote Summary */
+
+       if (v->summary) if (!IsEmptyStr(v->summary)) {
+               if (msg->cm_fields['U'] != NULL) {
+                       free(msg->cm_fields['U']);
+               }
+               msg->cm_fields['U'] = strdup(v->summary);
+               if (strlen(msg->cm_fields['U']) > 72) {
+                       strcpy(&msg->cm_fields['U'][68], "...");
+               }
+       }
+
+       vnote_free(v);
        
        return(0);
 }
@@ -112,5 +183,5 @@ CTDL_MODULE_INIT(notes)
        }
        
        /* return our Subversion id for the Log */
-       return "$Id$";
+       return "notes";
 }