IMPORTANT FIX TO VCARD / GLOBAL ADDRESS BOOK ROOM. VERSION UPDATE TO 8.03. DEPLOY...

[citadel.git] / citadel / modules / vcard / serv_vcard.c

diff --git a/citadel/modules/vcard/serv_vcard.c b/citadel/modules/vcard/serv_vcard.c
index cc0ad99fb3fedea418562ac58621765d2fe22285..141a362e85e7212221df2c683adb2c101745eb76 100644 (file)
--- a/citadel/modules/vcard/serv_vcard.c
+++ b/citadel/modules/vcard/serv_vcard.c
@@ -362,7 +362,6 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
        }
 
        s = vcard_get_prop(v, "fn", 1, 0, 0);
-       if (s) syslog(LOG_DEBUG, "vCard beforesave hook running for <%s>\n", s);
 
        if (yes_my_citadel_config) {
                /* Bingo!  The user is uploading a new vCard, so
@@ -522,8 +521,8 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) {
                         * copy it to the Global Address Book room.
                         */
 
-                       I = atol(msg->cm_fields['I']);
-                       if (I < 0L) return(0);
+                       I = atol(msg->cm_fields['3']);
+                       if (I <= 0L) return(0);
 
                        /* Store our Internet return address in memory */
                        if (is_MY_UserConf) {
@@ -1315,7 +1314,6 @@ void strip_addresses_already_have(long msgnum, void *userdata) {
  */
 void store_this_ha(struct addresses_to_be_filed *aptr) {
        struct CtdlMessage *vmsg = NULL;
-       long vmsgnum = (-1L);
        char *ser = NULL;
        struct vCard *v = NULL;
        char recipient[256];
@@ -1352,7 +1350,7 @@ void store_this_ha(struct addresses_to_be_filed *aptr) {
                        vcard_free(v);
 
                        syslog(LOG_DEBUG, "Adding contact: %s\n", recipient);
-                       vmsgnum = CtdlSubmitMsg(vmsg, NULL, aptr->roomname, QP_EADDR);
+                       CtdlSubmitMsg(vmsg, NULL, aptr->roomname, QP_EADDR);
                        CtdlFreeMessage(vmsg);
                }
        }
@@ -1459,6 +1457,9 @@ CTDL_MODULE_INIT(vcard)
                        fp = fopen(filename, "a");
                        if (fp != NULL) fclose(fp);
                        rv = chown(filename, CTDLUID, (-1));
+                       if (rv == -1)
+                               syslog(LOG_EMERG, "Failed to adjust ownership of: %s [%s]\n", 
+                                      filename, strerror(errno));
                }
 
                /* for postfix tcpdict */