X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fwiki%2Fserv_wiki.c;h=e5d2f545533de44f133d74e6820757ffe111bf30;hb=0387f48886a9395d89eaca01cd40ab751610426f;hp=ccfc77b7e66495e3c274d32a9a825798a6a1056f;hpb=55013f95f08eafe1b375df4241e8defe387c6cdc;p=citadel.git

diff --git a/citadel/modules/wiki/serv_wiki.c b/citadel/modules/wiki/serv_wiki.c
index ccfc77b7e..e5d2f5455 100644
--- a/citadel/modules/wiki/serv_wiki.c
+++ b/citadel/modules/wiki/serv_wiki.c
@@ -1,7 +1,7 @@
 /*
  * Server-side module for Wiki rooms.  This handles things like version control. 
  * 
- * Copyright (c) 2009-2012 by the citadel.org team
+ * Copyright (c) 2009-2020 by the citadel.org team
  *
  * This program is open source software.  You can redistribute it and/or
  * modify it under the terms of the GNU General Public License, version 3.
@@ -90,11 +90,14 @@ int wiki_upload_beforesave(struct CtdlMessage *msg, recptypes *recp) {
 	char *diffbuf = NULL;
 	size_t diffbuf_len = 0;
 	char *ptr = NULL;
+	long newmsgid;
+	StrBuf *msgidbuf;
 
 	if (!CCC->logged_in) return(0);	/* Only do this if logged in. */
 
 	/* Is this a room with a Wiki in it, don't run this hook. */
-	if (CCC->room.QRdefaultview != VIEW_WIKI) {
+	if ((CCC->room.QRdefaultview != VIEW_WIKI) &&
+	    (CCC->room.QRdefaultview != VIEW_WIKIMD)) {
 		return(0);
 	}
 
@@ -104,6 +107,17 @@ int wiki_upload_beforesave(struct CtdlMessage *msg, recptypes *recp) {
 	/* If there's no EUID we can't do this.  Reject the post. */
 	if (CM_IsEmpty(msg, eExclusiveID)) return(1);
 
+	newmsgid = get_new_message_number();
+	msgidbuf = NewStrBuf();
+	StrBufPrintf(msgidbuf, "%08lX-%08lX@%s/%s",
+		     (long unsigned int) time(NULL),
+		     (long unsigned int) newmsgid,
+		     CtdlGetConfigStr("c_fqdn"),
+		     msg->cm_fields[eExclusiveID]
+		);
+
+	CM_SetAsFieldSB(msg, emessageId, &msgidbuf);
+
 	history_page_len = snprintf(history_page, sizeof history_page,
 				    "%s_HISTORY_", msg->cm_fields[eExclusiveID]);
 
@@ -221,7 +235,9 @@ int wiki_upload_beforesave(struct CtdlMessage *msg, recptypes *recp) {
 		history_msg->cm_anon_type = MES_NORMAL;
 		history_msg->cm_format_type = FMT_RFC822;
 		CM_SetField(history_msg, eAuthor, HKEY("Citadel"));
-		CM_SetField(history_msg, eRecipient, CCC->room.QRname, strlen(CCC->room.QRname));
+		if (!IsEmptyStr(CCC->room.QRname)){
+			CM_SetField(history_msg, eRecipient, CCC->room.QRname, strlen(CCC->room.QRname));
+		}
 		CM_SetField(history_msg, eExclusiveID, history_page, history_page_len);
 		CM_SetField(history_msg, eMsgSubject, history_page, history_page_len);
 		CM_SetField(history_msg, eSuppressIdx, HKEY("1")); /* suppress full text indexing */
@@ -302,7 +318,7 @@ int wiki_upload_beforesave(struct CtdlMessage *msg, recptypes *recp) {
 					   uuid,
 					   Now,
 					   CCC->user.fullname,
-					   config.c_nodename);
+					   CtdlGetConfigStr("c_nodename"));
 
 			memolen = CtdlEncodeBase64(encoded_memo, memo, memolen, 0);
 
@@ -336,7 +352,7 @@ int wiki_upload_beforesave(struct CtdlMessage *msg, recptypes *recp) {
 
 		CM_SetFieldLONG(history_msg, eTimestamp, Now);
 	
-		CtdlSubmitMsg(history_msg, NULL, "", 0);
+		CtdlSubmitMsg(history_msg, NULL, "");
 	}
 	else {
 		syslog(LOG_ALERT, "Empty boundary string in history message.  No history!\n");
@@ -407,7 +423,7 @@ void wiki_history(char *pagename) {
 
 	
 	cprintf("%d Revision history for '%s'\n", LISTING_FOLLOWS, pagename);
-	mime_parser(msg->cm_fields[eMesageText], NULL, *wiki_history_callback, NULL, NULL, NULL, 0);
+	mime_parser(CM_RANGE(msg, eMesageText), *wiki_history_callback, NULL, NULL, NULL, 0);
 	cprintf("000\n");
 
 	CM_Free(msg);
@@ -546,7 +562,7 @@ void wiki_rev(char *pagename, char *rev, char *operation)
 		fclose(fp);
 	}
 	else {
-		syslog(LOG_ALERT, "Cannot open %s: %s\n", temp, strerror(errno));
+		syslog(LOG_ERR, "%s: %m", temp);
 	}
 	CM_Free(msg);
 
@@ -580,7 +596,7 @@ void wiki_rev(char *pagename, char *rev, char *operation)
 	hecbd.stop_when = rev;
 	striplt(hecbd.stop_when);
 
-	mime_parser(msg->cm_fields[eMesageText], NULL, *wiki_rev_callback, NULL, NULL, (void *)&hecbd, 0);
+	mime_parser(CM_RANGE(msg, eMesageText), *wiki_rev_callback, NULL, NULL, (void *)&hecbd, 0);
 	CM_Free(msg);
 
 	/* Were we successful? */
@@ -617,7 +633,7 @@ void wiki_rev(char *pagename, char *rev, char *operation)
 		else if (!strcasecmp(operation, "fetch")) {
 			CM_SetField(msg, eAuthor, HKEY("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 */
+			msgnum = CtdlSubmitMsg(msg, NULL, wwm);		/* Store the revision here */
 
 			/*
 			 * WARNING: VILE SLEAZY HACK
@@ -639,12 +655,22 @@ void wiki_rev(char *pagename, char *rev, char *operation)
 		}
 		else if (!strcasecmp(operation, "revert")) {
 			CM_SetFieldLONG(msg, eTimestamp, time(NULL));
-			CM_SetField(msg, eAuthor, CCC->user.fullname, strlen(CCC->user.fullname));
-			CM_SetField(msg, erFc822Addr, CCC->cs_inet_email, strlen(CCC->cs_inet_email));
-			CM_SetField(msg, eOriginalRoom, CCC->room.QRname, strlen(CCC->room.QRname));
-			CM_SetField(msg, eNodeName, NODENAME, strlen(NODENAME));
-			CM_SetField(msg, eExclusiveID, pagename, strlen(pagename));
-			msgnum = CtdlSubmitMsg(msg, NULL, "", 0);	/* Replace the current revision */
+			if (!IsEmptyStr(CCC->user.fullname)) {
+				CM_SetField(msg, eAuthor, CCC->user.fullname, strlen(CCC->user.fullname));
+			}
+
+			if (!IsEmptyStr(CCC->cs_inet_email)) {
+				CM_SetField(msg, erFc822Addr, CCC->cs_inet_email, strlen(CCC->cs_inet_email));
+			}
+
+			if (!IsEmptyStr(CCC->room.QRname)) {
+				CM_SetField(msg, eOriginalRoom, CCC->room.QRname, strlen(CCC->room.QRname));
+			}
+
+			if (!IsEmptyStr(pagename)) {
+				CM_SetField(msg, eExclusiveID, pagename, strlen(pagename));
+			}
+			msgnum = CtdlSubmitMsg(msg, NULL, "");		/* Replace the current revision */
 		}
 		else {
 			/* Theoretically it is impossible to get here, but throw an error anyway */