More logging for Global Address Book saves, for debugging

[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 8340d4eebad1a7632d5c03d3376fa6208b9d2fb3..5486e094783a1bc5af878ce03d32d2bdbf40c3cc 100644 (file)
--- a/citadel/modules/vcard/serv_vcard.c
+++ b/citadel/modules/vcard/serv_vcard.c
@@ -198,7 +198,7 @@ void cmd_igab(char *argbuf) {
        CtdlDirectoryInit();
 
        /* We want *all* vCards in this room */
-       CtdlForEachMessage(MSGS_ALL, 0, NULL, "^[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$",
+       CtdlForEachMessage(MSGS_ALL, 0, NULL, "[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$",
                NULL, vcard_add_to_directory, NULL);
 
        CtdlGetRoom(&CC->room, hold_rm);        /* return to saved room */
@@ -318,6 +318,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
           && (!strcasecmp(&CC->room.QRname[11], USERCONFIGROOM)) ) {
                /* Yes, we want to do this */
                yes_my_citadel_config = 1;
+               syslog(LOG_DEBUG, "GAB: user config room detected");
 
 #ifdef VCARD_SAVES_BY_AIDES_ONLY
                /* Prevent non-aides from performing registration changes */
@@ -331,6 +332,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
        /* Is this a room with an address book in it? */
        if (CC->room.QRdefaultview == VIEW_ADDRESSBOOK) {
                yes_any_vcard_room = 1;
+               syslog(LOG_DEBUG, "GAB: address book room detected");
        }
 
        /* If neither condition exists, don't run this hook. */
@@ -362,7 +364,7 @@ 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 (s) syslog(LOG_DEBUG, "GAB: vCard beforesave hook running for <%s>\n", s);
 
        if (yes_my_citadel_config) {
                /* Bingo!  The user is uploading a new vCard, so
@@ -393,7 +395,8 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
                 * vCard in the user's config room at all times.
                 *
                 */
-               CtdlDeleteMessages(CC->room.QRname, NULL, 0, "^[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$");
+               syslog(LOG_DEBUG, "GAB: deleting old vCard for user");
+               CtdlDeleteMessages(CC->room.QRname, NULL, 0, "[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$");
 
                /* Make the author of the message the name of the user. */
                if (msg->cm_fields['A'] != NULL) {
@@ -468,6 +471,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
 
        /* Now allow the save to complete. */
        vcard_free(v);
+       syslog(LOG_DEBUG, "GAB: save will proceed");
        return(0);
 }
 
@@ -496,14 +500,17 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) {
 
        if ( (strlen(CC->room.QRname) >= 12) && (!strcasecmp(&CC->room.QRname[11], USERCONFIGROOM)) ) {
                is_UserConf = 1;        /* It's someone's config room */
+               syslog(LOG_DEBUG, "GAB: this is someone's config room");
        }
        CtdlMailboxName(roomname, sizeof roomname, &CC->user, USERCONFIGROOM);
        if (!strcasecmp(CC->room.QRname, roomname)) {
                is_UserConf = 1;
                is_MY_UserConf = 1;     /* It's MY config room */
+               syslog(LOG_DEBUG, "GAB: this is MY config room");
        }
        if (!strcasecmp(CC->room.QRname, ADDRESS_BOOK_ROOM)) {
                is_GAB = 1;             /* It's the Global Address Book */
+               syslog(LOG_DEBUG, "GAB: this is the Global Address Book");
        }
 
        if (!is_UserConf && !is_GAB) return(0);
@@ -538,6 +545,7 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) {
                        if (!is_GAB)
                        {       // This is not the GAB
                                /* Put it in the Global Address Book room... */
+                               syslog(LOG_DEBUG, "GAB: copying to Global Address Book");
                                CtdlSaveMsgPointerInRoom(ADDRESS_BOOK_ROOM, I, 1, msg);
                        }
 
@@ -607,7 +615,7 @@ struct vCard *vcard_get_user(struct ctdluser *u) {
 
        /* We want the last (and probably only) vcard in this room */
        VCmsgnum = (-1);
-       CtdlForEachMessage(MSGS_LAST, 1, NULL, "^[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$",
+       CtdlForEachMessage(MSGS_LAST, 1, NULL, "[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$",
                NULL, vcard_gu_backend, (void *)&VCmsgnum );
        CtdlGetRoom(&CC->room, hold_rm);        /* return to saved room */
 
@@ -1315,7 +1323,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];
@@ -1323,7 +1330,7 @@ void store_this_ha(struct addresses_to_be_filed *aptr) {
 
        /* First remove any addresses we already have in the address book */
        CtdlUserGoto(aptr->roomname, 0, 0, NULL, NULL);
-       CtdlForEachMessage(MSGS_ALL, 0, NULL, "^[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$", NULL,
+       CtdlForEachMessage(MSGS_ALL, 0, NULL, "[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$", NULL,
                strip_addresses_already_have, aptr->collected_addresses);
 
        if (!IsEmptyStr(aptr->collected_addresses))
@@ -1352,7 +1359,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 +1466,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 */
@@ -1470,6 +1480,6 @@ CTDL_MODULE_INIT(vcard)
                                        CitadelServiceDICT_TCP);
        }
        
-       /* return our Subversion id for the Log */
+       /* return our module name for the log */
        return "vcard";
 }