X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit%2Fmessages.c;h=f990c8700b09d1e358e502181194cccc5ec5c045;hp=6af7002b58a4d29288e74584395559587b5bae67;hb=dca4414169da8ea7161d5b95fc9ccbefe5d39651;hpb=4b4dc864ede7c5d8d956febe4a0afb422b78e7c4

diff --git a/webcit/messages.c b/webcit/messages.c
index 6af7002b5..f990c8700 100644
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -1,21 +1,15 @@
 /*
  * Functions which deal with the fetching and displaying of messages.
  *
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-2012 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 as
- * published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
+ * modify it under the terms of the GNU General Public License, version 3.
  *
  * 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 "webcit.h"
@@ -1017,7 +1011,7 @@ void post_message(void)
 		StrBuf *Recp = NULL; 
 		StrBuf *Cc = NULL;
 		StrBuf *Bcc = NULL;
-		const StrBuf *Wikipage = NULL;
+		char *wikipage = NULL;
 		const StrBuf *my_email_addr = NULL;
 		StrBuf *CmdBuf = NULL;
 		StrBuf *references = NULL;
@@ -1072,14 +1066,15 @@ void post_message(void)
 		FreeStrBuf(&EmailAddress);
 		FreeStrBuf(&EncBuf);
 
-		Wikipage = sbstr("page");
+		wikipage = strdup(bstr("page"));
+		str_wiki_index(wikipage);
 		my_email_addr = sbstr("my_email_addr");
 		
 		HeaderLen = StrLength(Recp) + 
 			StrLength(encoded_subject) +
 			StrLength(Cc) +
 			StrLength(Bcc) + 
-			StrLength(Wikipage) +
+			strlen(wikipage) +
 			StrLength(my_email_addr) + 
 			StrLength(references);
 		CmdBuf = NewStrBufPlain(NULL, sizeof (CMD) + HeaderLen);
@@ -1091,11 +1086,12 @@ void post_message(void)
 			     ChrPtr(display_name),
 			     saving_to_drafts?"":ChrPtr(Cc),
 			     saving_to_drafts?"":ChrPtr(Bcc),
-			     ChrPtr(Wikipage),
+			     wikipage,
 			     ChrPtr(my_email_addr),
 			     ChrPtr(references));
 		FreeStrBuf(&references);
 		FreeStrBuf(&encoded_subject);
+		free(wikipage);
 
 		if ((HeaderLen + StrLength(sbstr("msgtext")) < 10) && 
 		    (GetCount(WCC->attachments) == 0)){
@@ -1579,14 +1575,15 @@ void display_enter(void)
 		const StrBuf *Recp = NULL; 
 		const StrBuf *Cc = NULL;
 		const StrBuf *Bcc = NULL;
-		const StrBuf *Wikipage = NULL;
+		char *wikipage = NULL;
 		StrBuf *CmdBuf = NULL;
 		const char CMD[] = "ENT0 0|%s|%d|0||%s||%s|%s|%s";
 		
 		Recp = sbstr("recp");
 		Cc = sbstr("cc");
 		Bcc = sbstr("bcc");
-		Wikipage = sbstr("page");
+		wikipage = strdup(bstr("page"));
+		str_wiki_index(wikipage);
 		
 		CmdBuf = NewStrBufPlain(NULL, 
 					sizeof (CMD) + 
@@ -1594,7 +1591,7 @@ void display_enter(void)
 					StrLength(display_name) +
 					StrLength(Cc) +
 					StrLength(Bcc) + 
-					StrLength(Wikipage));
+					strlen(wikipage));
 
 		StrBufPrintf(CmdBuf, 
 			     CMD,
@@ -1603,9 +1600,11 @@ void display_enter(void)
 			     ChrPtr(display_name),
 			     ChrPtr(Cc), 
 			     ChrPtr(Bcc), 
-			     ChrPtr(Wikipage));
+			     wikipage
+		);
 		serv_puts(ChrPtr(CmdBuf));
 		StrBuf_ServGetln(CmdBuf);
+		free(wikipage);
 
 		rc = GetServerStatusMsg(CmdBuf, &Result, 0, 0);