projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7d014eb
)
IMPORTANT FIX TO VCARD / GLOBAL ADDRESS BOOK ROOM. VERSION UPDATE TO 8.03. DEPLOY...
author
Art Cancro
<ajc@uncensored.citadel.org>
Tue, 6 Dec 2011 05:25:37 +0000
(
00:25
-0500)
committer
Wilfried Goesgens
<dothebart@citadel.org>
Tue, 6 Dec 2011 08:18:57 +0000
(09:18 +0100)
citadel/citadel.h
patch
|
blob
|
history
citadel/configure.ac
patch
|
blob
|
history
citadel/debian/changelog
patch
|
blob
|
history
citadel/modules/vcard/serv_vcard.c
patch
|
blob
|
history
citadel/msgbase.c
patch
|
blob
|
history
citadel/techdoc/hack.txt
patch
|
blob
|
history
diff --git
a/citadel/citadel.h
b/citadel/citadel.h
index 03c71a7eafdec32659c3506a682395a767e960b2..dbef91b2909ef40a171c710aad25d94746274d21 100644
(file)
--- a/
citadel/citadel.h
+++ b/
citadel/citadel.h
@@
-51,7
+51,7
@@
extern "C" {
* usually more strict because you're not really supposed to dump/load and
* upgrade at the same time.
*/
* usually more strict because you're not really supposed to dump/load and
* upgrade at the same time.
*/
-#define REV_LEVEL 80
2
/* This version */
+#define REV_LEVEL 80
3
/* This version */
#define REV_MIN 591 /* Oldest compatible database */
#define EXPORT_REV_MIN 760 /* Oldest compatible export files */
#define LIBCITADEL_MIN 802 /* Minimum required version of libcitadel */
#define REV_MIN 591 /* Oldest compatible database */
#define EXPORT_REV_MIN 760 /* Oldest compatible export files */
#define LIBCITADEL_MIN 802 /* Minimum required version of libcitadel */
diff --git
a/citadel/configure.ac
b/citadel/configure.ac
index 0dd0792658070efa8df219b6f7862a9a157717c6..aa19866afcc29fc0e4406bd655cd2d8b58760144 100644
(file)
--- a/
citadel/configure.ac
+++ b/
citadel/configure.ac
@@
-1,6
+1,6
@@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.52)
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.52)
-AC_INIT([Citadel], [8.0
2
], [http://www.citadel.org/])
+AC_INIT([Citadel], [8.0
3
], [http://www.citadel.org/])
AC_REVISION([$Revision: 5108 $])
AC_CONFIG_SRCDIR([citserver.c])
AC_CONFIG_HEADER(sysdep.h)
AC_REVISION([$Revision: 5108 $])
AC_CONFIG_SRCDIR([citserver.c])
AC_CONFIG_HEADER(sysdep.h)
diff --git
a/citadel/debian/changelog
b/citadel/debian/changelog
index bc73b94e0bddda5f5e9ddee018412889113a3011..783e87420ef1720b790973466e7ab194c86f41d9 100644
(file)
--- a/
citadel/debian/changelog
+++ b/
citadel/debian/changelog
@@
-1,3
+1,9
@@
+citadel (8.03-1) stable; urgency=low
+
+ * new upstream version
+
+ -- Wilfried Goesgens <w.goesgens@outgesourced.org> Mon, 5 Dec 2011 22:00:00 +0001
+
citadel (8.02-1) stable; urgency=low
* new upstream version
citadel (8.02-1) stable; urgency=low
* new upstream version
diff --git
a/citadel/modules/vcard/serv_vcard.c
b/citadel/modules/vcard/serv_vcard.c
index 6a21cd9a7ece7b735c6b562448821539b0e63bec..84540165bdabacfaa0aef528f3f690a2fd235b98 100644
(file)
--- a/
citadel/modules/vcard/serv_vcard.c
+++ b/
citadel/modules/vcard/serv_vcard.c
@@
-353,7
+353,6
@@
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 */
@@
-367,7
+366,6
@@
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. */
@@
-399,7
+397,6
@@
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, "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
@@
-430,7
+427,6
@@
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. */
@@
-506,7
+502,6
@@
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);
}
@@
-535,17
+530,14
@@
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);
@@
-569,9
+561,8
@@
int vcard_upload_aftersave(struct CtdlMessage *msg) {
* copy it to the Global Address Book room.
*/
* copy it to the Global Address Book room.
*/
- I = atol(msg->cm_fields['I']);
- syslog(LOG_DEBUG, "GAB: \033[35m%s\033[0m", 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) {
/* Store our Internet return address in memory */
if (is_MY_UserConf) {
@@
-586,7
+577,6
@@
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);
}
diff --git
a/citadel/msgbase.c
b/citadel/msgbase.c
index 1bc393b26efc0c958d6655f4fc0910ea4863fef2..c583263eb4ebc19220aa72a3660637dcff0ca1b6 100644
(file)
--- a/
citadel/msgbase.c
+++ b/
citadel/msgbase.c
@@
-2635,7
+2635,6
@@
int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newms
"CtdlSaveMsgPointersInRoom(room=%s, num_msgs=%d, repl=%d, suppress_rca=%d)\n",
roomname, num_newmsgs, do_repl_check, suppress_refcount_adj
);
"CtdlSaveMsgPointersInRoom(room=%s, num_msgs=%d, repl=%d, suppress_rca=%d)\n",
roomname, num_newmsgs, do_repl_check, suppress_refcount_adj
);
- if (num_newmsgs > 0) for (i=0; i<num_newmsgs; ++i) syslog(LOG_DEBUG, "\033[33mmerge %ld\033[0m", newmsgidlist[i]);
strcpy(hold_rm, CC->room.QRname);
strcpy(hold_rm, CC->room.QRname);
@@
-2682,10
+2681,6
@@
int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newms
}
if (unique) {
msgs_to_be_merged[num_msgs_to_be_merged++] = newmsgidlist[i];
}
if (unique) {
msgs_to_be_merged[num_msgs_to_be_merged++] = newmsgidlist[i];
- syslog(LOG_DEBUG, "\033[32mmsg %ld is being merged\033[0m", newmsgidlist[i]);
- }
- else {
- syslog(LOG_DEBUG, "\033[31mmsg %ld is not unique\033[0m", newmsgidlist[i]);
}
}
}
}
@@
-3266,14
+3261,18
@@
long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */
}
else {
syslog(LOG_DEBUG, "No user <%s>\n", recipient);
}
else {
syslog(LOG_DEBUG, "No user <%s>\n", recipient);
- CtdlSaveMsgPointerInRoom(config.c_aideroom,
- newmsgid, 0, msg);
+ CtdlSaveMsgPointerInRoom(config.c_aideroom, newmsgid, 0, msg);
}
}
/* Perform "after save" hooks */
syslog(LOG_DEBUG, "Performing after-save hooks\n");
}
}
/* Perform "after save" hooks */
syslog(LOG_DEBUG, "Performing after-save hooks\n");
+ if (msg->cm_fields['3'] != NULL) free(msg->cm_fields['3']);
+ msg->cm_fields['3'] = malloc(20);
+ snprintf(msg->cm_fields['3'], 20, "%ld", newmsgid);
PerformMessageHooks(msg, EVT_AFTERSAVE);
PerformMessageHooks(msg, EVT_AFTERSAVE);
+ free(msg->cm_fields['3']);
+ msg->cm_fields['3'] = NULL;
/* For IGnet mail, we have to save a new copy into the spooler for
* each recipient, with the R and D fields set to the recipient and
/* For IGnet mail, we have to save a new copy into the spooler for
* each recipient, with the R and D fields set to the recipient and
diff --git
a/citadel/techdoc/hack.txt
b/citadel/techdoc/hack.txt
index 20e45a5498d4e12bb68509c80ef20117f1e6104a..c4fec985d563df1c9700b902982b5cf5fa40fce7 100644
(file)
--- a/
citadel/techdoc/hack.txt
+++ b/
citadel/techdoc/hack.txt
@@
-293,6
+293,8
@@
Y carbon copY Optional, and only in Mail messages.
1 suppress index The presence of this field indicates that the message is
disqualified from being added to the full text index.
2 extnotify Used internally by the serv_extnotify module.
1 suppress index The presence of this field indicates that the message is
disqualified from being added to the full text index.
2 extnotify Used internally by the serv_extnotify module.
+3 msgnum Used internally to pass the local message number in the
+ database to after-save hooks. Discarded afterwards.
EXAMPLE
EXAMPLE