From f9c52de63b58d007291f0e33c035eeb10f728115 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Mon, 28 Nov 2011 22:29:10 -0500 Subject: [PATCH] More logging for Global Address Book saves, for debugging --- citadel/modules/vcard/serv_vcard.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/citadel/modules/vcard/serv_vcard.c b/citadel/modules/vcard/serv_vcard.c index 8efae6578..5486e0947 100644 --- a/citadel/modules/vcard/serv_vcard.c +++ b/citadel/modules/vcard/serv_vcard.c @@ -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,6 +395,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) { * vCard in the user's config room at all times. * */ + 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. */ @@ -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); } -- 2.30.2