/* If this isn't a MIME message, don't bother. */
if (msg->cm_format_type != 4) return(0);
- /* If there's no EUID we can't do this. */
- if (msg->cm_fields['E'] == NULL) return(0);
+ /* If there's no EUID we can't do this. Reject the post. */
+ if (msg->cm_fields['E'] == NULL) return(1);
+
snprintf(history_page, sizeof history_page, "%s_HISTORY_", msg->cm_fields['E']);
/* Make sure we're saving a real wiki page rather than a wiki history page.
/* If there's no message text, obviously this is all b0rken and shouldn't happen at all */
if (msg->cm_fields['M'] == NULL) return(0);
+ /* Set the message subject identical to the page name */
+ if (msg->cm_fields['U'] != NULL) {
+ free(msg->cm_fields['U']);
+ }
+ msg->cm_fields['U'] = strdup(msg->cm_fields['E']);
+
/* See if we can retrieve the previous version. */
- old_msgnum = locate_message_by_euid(msg->cm_fields['E'], &CCC->room);
+ old_msgnum = CtdlLocateMessageByEuid(msg->cm_fields['E'], &CCC->room);
if (old_msgnum > 0L) {
old_msg = CtdlFetchMessage(old_msgnum, 1);
}
diffbuf_len += nbytes;
} while (nbytes == 1024);
diffbuf[diffbuf_len] = 0;
- pclose(fp);
+ if (pclose(fp) != 0) {
+ CtdlLogPrintf(CTDL_ERR, "pclose() returned an error - diff failed\n");
+ }
}
CtdlLogPrintf(CTDL_DEBUG, "diff length is %d bytes\n", diffbuf_len);
/* Now look for the existing edit history */
- history_msgnum = locate_message_by_euid(history_page, &CCC->room);
+ history_msgnum = CtdlLocateMessageByEuid(history_page, &CCC->room);
history_msg = NULL;
if (history_msgnum > 0L) {
history_msg = CtdlFetchMessage(history_msgnum, 1);
history_msg->cm_fields['R'] = strdup(CCC->room.QRname);
history_msg->cm_fields['E'] = strdup(history_page);
history_msg->cm_fields['U'] = strdup(history_page);
+ history_msg->cm_fields['1'] = strdup("1"); /* suppress full text indexing */
snprintf(boundary, sizeof boundary, "Citadel--Multipart--%04x--%08lx", getpid(), time(NULL));
history_msg->cm_fields['M'] = malloc(1024);
snprintf(history_msg->cm_fields['M'], 1024,
/* Update the history message (regardless of whether it's new or existing) */
- /* First, figure out the boundary string. We do this even when we generated the
+ /* Remove the Message-ID from the old version of the history message. This will cause a brand
+ * new one to be generated, avoiding an uninitentional hit of the loop zapper when we replicate.
+ */
+ if (history_msg->cm_fields['I'] != NULL) {
+ free(history_msg->cm_fields['I']);
+ }
+
+ /* Figure out the boundary string. We do this even when we generated the
* boundary string in the above code, just to be safe and consistent.
*/
strcpy(boundary, "");
}
snprintf(history_page_name, sizeof history_page_name, "%s_HISTORY_", pagename);
- msgnum = locate_message_by_euid(history_page_name, &CC->room);
+ msgnum = CtdlLocateMessageByEuid(history_page_name, &CC->room);
if (msgnum > 0L) {
msg = CtdlFetchMessage(msgnum, 1);
}
CtdlLogPrintf(CTDL_DEBUG, "callback found rev: %s\n", this_rev);
/* Perform the patch */
- fp = popen("patch -f -s -p0 >/dev/null 2>/dev/null", "w");
+ fp = popen("patch -f -s -p0 --global-reject-file=/dev/null >/dev/null 2>/dev/null", "w");
if (fp) {
/* Replace the filenames in the patch with the tempfilename we're actually tweaking */
fprintf(fp, "--- %s\n", hecbd->tempfilename);
fprintf(fp, "%s\n", buf);
}
}
- } while ((*ptr != 0) && ((int)ptr < ((int)content + length)));
- pclose(fp);
+ } while ((*ptr != 0) && (ptr < ((char*)content + length)));
+ if (pclose(fp) != 0) {
+ CtdlLogPrintf(CTDL_ERR, "pclose() returned an error - patch failed\n");
+ }
}
if (!strcasecmp(this_rev, hecbd->stop_when)) {
char history_page_name[270];
long msgnum;
char temp[PATH_MAX];
+ char timestamp[64];
struct CtdlMessage *msg;
FILE *fp;
struct HistoryEraserCallBackData hecbd;
+ long len = 0L;
int rv;
r = CtdlDoIHavePermissionToReadMessagesInThisRoom();
/* Begin by fetching the current version of the page. We're going to patch
* backwards through the diffs until we get the one we want.
*/
- msgnum = locate_message_by_euid(pagename, &CC->room);
+ msgnum = CtdlLocateMessageByEuid(pagename, &CC->room);
if (msgnum > 0L) {
msg = CtdlFetchMessage(msgnum, 1);
}
/* Get the revision history */
snprintf(history_page_name, sizeof history_page_name, "%s_HISTORY_", pagename);
- msgnum = locate_message_by_euid(history_page_name, &CC->room);
+ msgnum = CtdlLocateMessageByEuid(history_page_name, &CC->room);
if (msgnum > 0L) {
msg = CtdlFetchMessage(msgnum, 1);
}
/* We have the desired revision on disk. Now do something with it. */
- else if (!strcasecmp(operation, "fetch")) {
+ else if ( (!strcasecmp(operation, "fetch")) || (!strcasecmp(operation, "revert")) ) {
msg = malloc(sizeof(struct CtdlMessage));
memset(msg, 0, sizeof(struct CtdlMessage));
msg->cm_magic = CTDLMESSAGE_MAGIC;
msg->cm_anon_type = MES_NORMAL;
msg->cm_format_type = FMT_RFC822;
- msg->cm_fields['A'] = strdup("Citadel");
fp = fopen(temp, "r");
if (fp) {
- long len;
fseek(fp, 0L, SEEK_END);
len = ftell(fp);
fseek(fp, 0L, SEEK_SET);
msg->cm_fields['M'] = malloc(len + 1);
rv = fread(msg->cm_fields['M'], len, 1, fp);
+ CtdlLogPrintf(CTDL_DEBUG, "\033[32mdid %d blocks of %d bytes\033[0m\n", rv, len);
msg->cm_fields['M'][len] = 0;
fclose(fp);
}
- CtdlCreateRoom(wwm, 5, "", 0, 1, 1, VIEW_BBS); /* If it already exists, not an error */
- msgnum = CtdlSubmitMsg(msg, NULL, wwm, 0); /* Store the revision here */
+ if (len <= 0) {
+ msgnum = (-1L);
+ }
+ else if (!strcasecmp(operation, "fetch")) {
+ msg->cm_fields['A'] = strdup("Citadel");
+ CtdlCreateRoom(wwm, 5, "", 0, 1, 1, VIEW_BBS); /* Not an error if already exists */
+ msgnum = CtdlSubmitMsg(msg, NULL, wwm, 0); /* Store the revision here */
+ }
+ else if (!strcasecmp(operation, "revert")) {
+ snprintf(timestamp, sizeof timestamp, "%ld", time(NULL));
+ msg->cm_fields['T'] = strdup(timestamp);
+ msg->cm_fields['A'] = strdup(CC->user.fullname);
+ msg->cm_fields['F'] = strdup(CC->cs_inet_email);
+ msg->cm_fields['O'] = strdup(CC->room.QRname);
+ msg->cm_fields['N'] = strdup(NODENAME);
+ msg->cm_fields['E'] = strdup(pagename);
+ msgnum = CtdlSubmitMsg(msg, NULL, "", 0); /* Replace the current revision */
+ }
+ else {
+ /* Theoretically it is impossible to get here, but throw an error anyway */
+ msgnum = (-1L);
+ }
CtdlFreeMessage(msg);
- cprintf("%d %ld\n", CIT_OK, msgnum); /* And give the client a msgnum */
- }
-
- else if (!strcasecmp(operation, "revert")) {
- cprintf("%d FIXME not finished yet, check the log to find out wtf\n", ERROR);
+ if (msgnum >= 0L) {
+ cprintf("%d %ld\n", CIT_OK, msgnum); /* Give the client a msgnum */
+ }
+ else {
+ cprintf("%d Error %ld has occurred.\n", ERROR+INTERNAL_ERROR, msgnum);
+ }
}
/* We did all this work for nothing. Express anguish to the caller. */
projects / citadel.git / blobdiff