*
* Server-side module for Wiki rooms. This will handle things like version control.
*
- * Copyright (c) 2009 / released under the GNU General Public License v3
+ * Copyright (c) 2009 by the citadel.org team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "sysdep.h"
/*
* Before allowing a wiki page save to execute, we have to perform version control.
- * This involves fetching the old version of the page if it exists... FIXME finish this
+ * This involves fetching the old version of the page if it exists.
*/
int wiki_upload_beforesave(struct CtdlMessage *msg) {
struct CitContext *CCC = CC;
int rv;
char history_page[1024];
char boundary[256];
+ char prefixed_boundary[258];
+ char buf[1024];
int nbytes = 0;
char *diffbuf = NULL;
size_t diffbuf_len = 0;
+ char *ptr = NULL;
if (!CCC->logged_in) return(0); /* Only do this if logged in. */
/* If there's no EUID we can't do this. */
if (msg->cm_fields['E'] == NULL) return(0);
+ 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.
+ * This is important in order to avoid recursing infinitely into this hook.
+ */
+ if ( (strlen(msg->cm_fields['E']) >= 9)
+ && (!strcasecmp(&msg->cm_fields['E'][strlen(msg->cm_fields['E'])-9], "_HISTORY_"))
+ ) {
+ CtdlLogPrintf(CTDL_DEBUG, "History page not being historied\n");
+ return(0);
+ }
/* 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);
/* See if we can retrieve the previous version. */
old_msgnum = locate_message_by_euid(msg->cm_fields['E'], &CCC->room);
- if (old_msgnum <= 0L) return(0);
- snprintf(history_page, sizeof history_page, "%s_HISTORY_", msg->cm_fields['E']);
-
- old_msg = CtdlFetchMessage(old_msgnum, 1);
- if (old_msg == NULL) return(0);
+ if (old_msgnum > 0L) {
+ old_msg = CtdlFetchMessage(old_msgnum, 1);
+ }
+ else {
+ old_msg = NULL;
+ }
- if (old_msg->cm_fields['M'] == NULL) { /* old version is corrupt? */
+ if ((old_msg != NULL) && (old_msg->cm_fields['M'] == NULL)) { /* old version is corrupt? */
CtdlFreeMessage(old_msg);
- return(0);
+ old_msg = NULL;
}
-
+
/* If no changes were made, don't bother saving it again */
- if (!strcmp(msg->cm_fields['M'], old_msg->cm_fields['M'])) {
+ if ((old_msg != NULL) && (!strcmp(msg->cm_fields['M'], old_msg->cm_fields['M']))) {
CtdlFreeMessage(old_msg);
return(1);
}
CtdlMakeTempFileName(diff_old_filename, sizeof diff_old_filename);
CtdlMakeTempFileName(diff_new_filename, sizeof diff_new_filename);
- fp = fopen(diff_old_filename, "w");
- rv = fwrite(old_msg->cm_fields['M'], strlen(old_msg->cm_fields['M']), 1, fp);
- fclose(fp);
- CtdlFreeMessage(old_msg);
+ if (old_msg != NULL) {
+ fp = fopen(diff_old_filename, "w");
+ rv = fwrite(old_msg->cm_fields['M'], strlen(old_msg->cm_fields['M']), 1, fp);
+ fclose(fp);
+ CtdlFreeMessage(old_msg);
+ }
fp = fopen(diff_new_filename, "w");
rv = fwrite(msg->cm_fields['M'], strlen(msg->cm_fields['M']), 1, fp);
diffbuf_len = 0;
diffbuf = NULL;
- snprintf(diff_cmd, sizeof diff_cmd, "diff -u %s %s", diff_old_filename, diff_new_filename);
+ snprintf(diff_cmd, sizeof diff_cmd,
+ "diff -u %s %s",
+ diff_new_filename,
+ ((old_msg != NULL) ? diff_old_filename : "/dev/null")
+ );
fp = popen(diff_cmd, "r");
if (fp != NULL) {
do {
return(1); /* No changes at all? Abandon the post entirely! */
}
- free(diffbuf); /* FIXME do something with it */
-
/* Now look for the existing edit history */
history_msgnum = locate_message_by_euid(history_page, &CCC->room);
history_msg = NULL;
if (history_msgnum > 0L) {
- history_msg = CtdlFetchMessage(old_msgnum, 1);
+ history_msg = CtdlFetchMessage(history_msgnum, 1);
}
/* Create a new history message if necessary */
history_msg->cm_format_type = FMT_RFC822;
history_msg->cm_fields['A'] = strdup("Citadel");
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);
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,
"Content-type: multipart/mixed; boundary=\"%s\"\n\n"
"This is a Citadel wiki history encoded as multipart MIME.\n"
+ "Each part is comprised of a diff script representing one change set.\n"
+ "\n"
"--%s--\n"
,
boundary, boundary
}
/* Update the history message (regardless of whether it's new or existing) */
- /* FIXME now do something with it */
- CtdlLogPrintf(CTDL_DEBUG, "\033[31m%s\033[0m", history_msg->cm_fields['M']);
- /* FIXME */
+ /* First, 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, "");
+
+ ptr = history_msg->cm_fields['M'];
+ do {
+ ptr = memreadline(ptr, buf, sizeof buf);
+ if (*ptr != 0) {
+ striplt(buf);
+ if (!IsEmptyStr(buf) && (!strncasecmp(buf, "Content-type:", 13))) {
+ if (
+ (bmstrcasestr(buf, "multipart") != NULL)
+ && (bmstrcasestr(buf, "boundary=") != NULL)
+ ) {
+ safestrncpy(boundary, bmstrcasestr(buf, "\""), sizeof boundary);
+ char *qu;
+ qu = strchr(boundary, '\"');
+ if (qu) {
+ strcpy(boundary, ++qu);
+ }
+ qu = strchr(boundary, '\"');
+ if (qu) {
+ *qu = 0;
+ }
+ }
+ }
+ }
+ } while ( (IsEmptyStr(boundary)) && (*ptr != 0) );
+
+ /* Now look for the first boundary. That is where we need to insert our fun.
+ */
+ if (!IsEmptyStr(boundary)) {
+ snprintf(prefixed_boundary, sizeof prefixed_boundary, "--%s", boundary);
+ history_msg->cm_fields['M'] = realloc(history_msg->cm_fields['M'],
+ strlen(history_msg->cm_fields['M']) + strlen(diffbuf) + 512
+ );
+ ptr = bmstrcasestr(history_msg->cm_fields['M'], prefixed_boundary);
+ if (ptr != NULL) {
+ char *the_rest_of_it = strdup(ptr);
+ sprintf(ptr, "--%s\n"
+ "Content-type: text/plain\n"
+ "From: %s <%s>\n"
+ "\n"
+ "%s\n"
+ "%s"
+ ,
+ boundary,
+ CCC->user.fullname,
+ CCC->cs_inet_email,
+ diffbuf,
+ the_rest_of_it
+ );
+ free(the_rest_of_it);
+ }
+
+ history_msg->cm_fields['T'] = realloc(history_msg->cm_fields['T'], 32);
+ snprintf(history_msg->cm_fields['T'], 32, "%ld", time(NULL));
+
+ CtdlSubmitMsg(history_msg, NULL, "", 0);
+ }
+ else {
+ CtdlLogPrintf(CTDL_ALERT, "Empty boundary string in history message. No history!\n");
+ }
+ free(diffbuf);
free(history_msg);
return(0);
}
projects / citadel.git / blobdiff