projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5f5bb12
)
More logging for Global Address Book saves, for debugging
author
Art Cancro
<ajc@uncensored.citadel.org>
Tue, 29 Nov 2011 03:29:10 +0000
(22:29 -0500)
committer
Wilfried Goesgens
<dothebart@citadel.org>
Mon, 5 Dec 2011 22:04:36 +0000
(23:04 +0100)
citadel/modules/vcard/serv_vcard.c
patch
|
blob
|
history
diff --git
a/citadel/modules/vcard/serv_vcard.c
b/citadel/modules/vcard/serv_vcard.c
index c578eb430b8bde5388bc08b025471108247ff6ff..2dcd127191c5fb787662538ef8b79fff8b90b8b5 100644
(file)
--- a/
citadel/modules/vcard/serv_vcard.c
+++ b/
citadel/modules/vcard/serv_vcard.c
@@
-353,6
+353,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;
&& (!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 */
#ifdef VCARD_SAVES_BY_AIDES_ONLY
/* Prevent non-aides from performing registration changes */
@@
-366,6
+367,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;
/* 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. */
}
/* If neither condition exists, don't run this hook. */
@@
-397,7
+399,7
@@
int vcard_upload_beforesave(struct CtdlMessage *msg) {
}
s = vcard_get_prop(v, "fn", 1, 0, 0);
}
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
if (yes_my_citadel_config) {
/* Bingo! The user is uploading a new vCard, so
@@
-428,6
+430,7
@@
int vcard_upload_beforesave(struct CtdlMessage *msg) {
* vCard in the user's config room at all times.
*
*/
* 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. */
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. */
@@
-503,6
+506,7
@@
int vcard_upload_beforesave(struct CtdlMessage *msg) {
/* Now allow the save to complete. */
vcard_free(v);
/* Now allow the save to complete. */
vcard_free(v);
+ syslog(LOG_DEBUG, "GAB: save will proceed");
return(0);
}
return(0);
}
@@
-531,14
+535,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 */
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 */
}
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 */
}
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);
}
if (!is_UserConf && !is_GAB) return(0);
@@
-578,6
+585,7
@@
int vcard_upload_aftersave(struct CtdlMessage *msg) {
if (!is_GAB)
{ // This is not the GAB
/* Put it in the Global Address Book room... */
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);
}
CtdlSaveMsgPointerInRoom(ADDRESS_BOOK_ROOM, I, 1, msg);
}