X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserver%2Fmodules%2Fwiki%2Fserv_wiki.c;h=e2cbd355e362035ca42b533f039dbe7be824fa9d;hb=531c6449f1d765f5c871ba9d20a13e104d1f5529;hp=bf18afd485573fd2a809e41047de076dbc2c577c;hpb=6ce0d284993145869a896e5790e9b8250203f1c7;p=citadel.git

diff --git a/citadel/server/modules/wiki/serv_wiki.c b/citadel/server/modules/wiki/serv_wiki.c
index bf18afd48..e2cbd355e 100644
--- a/citadel/server/modules/wiki/serv_wiki.c
+++ b/citadel/server/modules/wiki/serv_wiki.c
@@ -119,7 +119,7 @@ int wiki_upload_beforesave(struct CtdlMessage *msg, struct recptypes *recp) {
 	}
 
 	/* If there's no message text, obviously this is all b0rken and shouldn't happen at all */
-	if (CM_IsEmpty(msg, eMesageText)) return(0);
+	if (CM_IsEmpty(msg, eMessageText)) return(0);
 
 	/* Set the message subject identical to the page name */
 	CM_CopyField(msg, eMsgSubject, eExclusiveID);
@@ -133,13 +133,13 @@ int wiki_upload_beforesave(struct CtdlMessage *msg, struct recptypes *recp) {
 		old_msg = NULL;
 	}
 
-	if ((old_msg != NULL) && (CM_IsEmpty(old_msg, eMesageText))) {	/* old version is corrupt? */
+	if ((old_msg != NULL) && (CM_IsEmpty(old_msg, eMessageText))) {	/* old version is corrupt? */
 		CM_Free(old_msg);
 		old_msg = NULL;
 	}
 	
 	/* If no changes were made, don't bother saving it again */
-	if ((old_msg != NULL) && (!strcmp(msg->cm_fields[eMesageText], old_msg->cm_fields[eMesageText]))) {
+	if ((old_msg != NULL) && (!strcmp(msg->cm_fields[eMessageText], old_msg->cm_fields[eMessageText]))) {
 		CM_Free(old_msg);
 		return(1);
 	}
@@ -153,13 +153,13 @@ int wiki_upload_beforesave(struct CtdlMessage *msg, struct recptypes *recp) {
 
 	if (old_msg != NULL) {
 		fp = fopen(diff_old_filename, "w");
-		rv = fwrite(old_msg->cm_fields[eMesageText], old_msg->cm_lengths[eMesageText], 1, fp);
+		rv = fwrite(old_msg->cm_fields[eMessageText], old_msg->cm_lengths[eMessageText], 1, fp);
 		fclose(fp);
 		CM_Free(old_msg);
 	}
 
 	fp = fopen(diff_new_filename, "w");
-	rv = fwrite(msg->cm_fields[eMesageText], msg->cm_lengths[eMesageText], 1, fp);
+	rv = fwrite(msg->cm_fields[eMessageText], msg->cm_lengths[eMessageText], 1, fp);
 	fclose(fp);
 
 	snprintf(diff_cmd, sizeof diff_cmd,
@@ -238,7 +238,7 @@ int wiki_upload_beforesave(struct CtdlMessage *msg, struct recptypes *recp) {
 			       "--%s--\n",
 			       boundary, boundary
 		);
-		CM_SetAsField(history_msg, eMesageText, &buf, len);
+		CM_SetAsField(history_msg, eMessageText, &buf, len);
 	}
 
 	/* Update the history message (regardless of whether it's new or existing) */
@@ -253,7 +253,7 @@ int wiki_upload_beforesave(struct CtdlMessage *msg, struct recptypes *recp) {
 	 */
 	*boundary = '\0';
 
-	ptr = history_msg->cm_fields[eMesageText];
+	ptr = history_msg->cm_fields[eMessageText];
 	do {
 		ptr = memreadline(ptr, buf, sizeof buf);
 		if (*ptr != 0) {
@@ -288,7 +288,7 @@ int wiki_upload_beforesave(struct CtdlMessage *msg, struct recptypes *recp) {
 
 		snprintf(prefixed_boundary, sizeof(prefixed_boundary), "--%s", boundary);
 		
-		CM_GetAsField(history_msg, eMesageText, &MsgText, &MsgTextLen);
+		CM_GetAsField(history_msg, eMessageText, &MsgText, &MsgTextLen);
 
 		ptr = bmstrcasestr(MsgText, prefixed_boundary);
 		if (ptr != NULL) {
@@ -330,10 +330,10 @@ int wiki_upload_beforesave(struct CtdlMessage *msg, struct recptypes *recp) {
 
 			StrBufAppendBufPlain(NewMsgText, ptr, MsgTextLen - (ptr - MsgText), 0);
 			free(MsgText);
-			CM_SetAsFieldSB(history_msg, eMesageText, &NewMsgText); 
+			CM_SetAsFieldSB(history_msg, eMessageText, &NewMsgText); 
 		}
 		else {
-			CM_SetAsField(history_msg, eMesageText, &MsgText, MsgTextLen); 
+			CM_SetAsField(history_msg, eMessageText, &MsgText, MsgTextLen); 
 		}
 
 		CM_SetFieldLONG(history_msg, eTimestamp, Now);
@@ -397,7 +397,7 @@ void wiki_history(char *pagename) {
 		msg = NULL;
 	}
 
-	if ((msg != NULL) && CM_IsEmpty(msg, eMesageText)) {
+	if ((msg != NULL) && CM_IsEmpty(msg, eMessageText)) {
 		CM_Free(msg);
 		msg = NULL;
 	}
@@ -409,7 +409,7 @@ void wiki_history(char *pagename) {
 
 	
 	cprintf("%d Revision history for '%s'\n", LISTING_FOLLOWS, pagename);
-	mime_parser(CM_RANGE(msg, eMesageText), *wiki_history_callback, NULL, NULL, NULL, 0);
+	mime_parser(CM_RANGE(msg, eMessageText), *wiki_history_callback, NULL, NULL, NULL, 0);
 	cprintf("000\n");
 
 	CM_Free(msg);
@@ -528,7 +528,7 @@ void wiki_rev(char *pagename, char *rev, char *operation)
 		msg = NULL;
 	}
 
-	if ((msg != NULL) && CM_IsEmpty(msg, eMesageText)) {
+	if ((msg != NULL) && CM_IsEmpty(msg, eMessageText)) {
 		CM_Free(msg);
 		msg = NULL;
 	}
@@ -543,7 +543,7 @@ void wiki_rev(char *pagename, char *rev, char *operation)
 	CtdlMakeTempFileName(temp, sizeof temp);
 	fp = fopen(temp, "w");
 	if (fp != NULL) {
-		r = fwrite(msg->cm_fields[eMesageText], msg->cm_lengths[eMesageText], 1, fp);
+		r = fwrite(msg->cm_fields[eMessageText], msg->cm_lengths[eMessageText], 1, fp);
 		fclose(fp);
 	}
 	else {
@@ -562,7 +562,7 @@ void wiki_rev(char *pagename, char *rev, char *operation)
 		msg = NULL;
 	}
 
-	if ((msg != NULL) && CM_IsEmpty(msg, eMesageText)) {
+	if ((msg != NULL) && CM_IsEmpty(msg, eMessageText)) {
 		CM_Free(msg);
 		msg = NULL;
 	}
@@ -581,7 +581,7 @@ void wiki_rev(char *pagename, char *rev, char *operation)
 	hecbd.stop_when = rev;
 	string_trim(hecbd.stop_when);
 
-	mime_parser(CM_RANGE(msg, eMesageText), *wiki_rev_callback, NULL, NULL, (void *)&hecbd, 0);
+	mime_parser(CM_RANGE(msg, eMessageText), *wiki_rev_callback, NULL, NULL, (void *)&hecbd, 0);
 	CM_Free(msg);
 
 	/* Were we successful? */
@@ -609,7 +609,7 @@ void wiki_rev(char *pagename, char *rev, char *operation)
 			rv = fread(msgbuf, len, 1, fp);
 			syslog(LOG_DEBUG, "did %d blocks of %ld bytes\n", rv, len);
 			msgbuf[len] = '\0';
-			CM_SetAsField(msg, eMesageText, &msgbuf, len);
+			CM_SetAsField(msg, eMessageText, &msgbuf, len);
 			fclose(fp);
 		}
 		if (len <= 0) {