X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fmessages.c;h=da9797e55740622997e1c352e385ef934ba4ab22;hb=016d4c328531362f6af77193507daec7e3c70de3;hp=db512156cc8421f623472bcb4a13be3726f7eec2;hpb=0658164140c50fe360ccd6883b236a34b6aa92dd;p=citadel.git

diff --git a/webcit/messages.c b/webcit/messages.c
index db512156c..da9797e55 100644
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -35,56 +35,38 @@ typedef struct _MsgPartEvaluatorStruct {
 /*----------------------------------------------------------------------------*/
 
 
-
-/*
- * I wanna SEE that message!
- *
- * msgnum		Message number to display
- * printable_view	Nonzero to display a printable view
- * section		Optional for encapsulated message/rfc822 submessage
- */
-int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, int printable_view, const StrBuf *PartNum) 
+int load_message(message_summary *Msg, 
+		 StrBuf *FoundCharset,
+		 StrBuf **Error)
 {
 	wcsession *WCC = WC;
 	StrBuf *Buf;
 	StrBuf *HdrToken;
-	StrBuf *FoundCharset;
-	HashPos  *it;
-	void *vMime;
-	message_summary *Msg = NULL;
 	headereval *Hdr;
 	void *vHdr;
 	char buf[SIZ];
 	int Done = 0;
 	int state=0;
-	long len;
-	const char *Key;
-	WCTemplputParams SubTP;
-
+	
 	Buf = NewStrBuf();
-	lprintf(1, "----------%s---------MSG4 %ld|%s--------------\n", tmpl, msgnum, ChrPtr(PartNum));
-	serv_printf("MSG4 %ld|%s", msgnum, ChrPtr(PartNum));
+	lprintf(1, "-------------------MSG4 %ld|%s--------------\n", Msg->msgnum, ChrPtr(Msg->PartNum));
+	if (Msg->PartNum != NULL)
+		serv_printf("MSG4 %ld|%s", Msg->msgnum, ChrPtr(Msg->PartNum));
+	else
+		serv_printf("MSG4 %ld", Msg->msgnum);
+
 	StrBuf_ServGetln(Buf);
 	if (GetServerStatus(Buf, NULL) != 1) {
-		StrBufAppendPrintf(Target, "<strong>");
-		StrBufAppendPrintf(Target, _("ERROR:"));
-		StrBufAppendPrintf(Target, "</strong> %s<br />\n", &buf[4]);
+		*Error = NewStrBuf();
+		StrBufAppendPrintf(*Error, "<strong>");
+		StrBufAppendPrintf(*Error, _("ERROR:"));
+		StrBufAppendPrintf(*Error, "</strong> %s<br />\n", &buf[4]);
 		FreeStrBuf(&Buf);
 		return 0;
 	}
 
 	/** begin everythingamundo table */
-
-
 	HdrToken = NewStrBuf();
-	Msg = (message_summary *)malloc(sizeof(message_summary));
-	memset(Msg, 0, sizeof(message_summary));
-	Msg->msgnum = msgnum;
-	Msg->PartNum = PartNum;
-	Msg->MsgBody =  (wc_mime_attachment*) malloc(sizeof(wc_mime_attachment));
-	memset(Msg->MsgBody, 0, sizeof(wc_mime_attachment));
-	Msg->MsgBody->msgnum = msgnum;
-	FoundCharset = NewStrBuf();
 	while ((StrBuf_ServGetln(Buf)>=0) && !Done) {
 		if ( (StrLength(Buf)==3) && 
 		    !strcmp(ChrPtr(Buf), "000")) 
@@ -92,7 +74,8 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, in
 			Done = 1;
 			if (state < 2) {
 				lprintf(1, _("unexpected end of message"));
-				
+				if (Msg->MsgBody->Data == NULL)
+					Msg->MsgBody->Data = NewStrBuf();
 				Msg->MsgBody->ContentType = NewStrBufPlain(HKEY("text/html"));
 				StrBufAppendPrintf(Msg->MsgBody->Data, "<div><i>");
 				StrBufAppendPrintf(Msg->MsgBody->Data, _("unexpected end of message"));
@@ -121,11 +104,12 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, in
 				if (Hdr->Type == 1) {
 					state++;
 				}
-			}
+			}/* TODO: 
 			else LogError(Target, 
 				      __FUNCTION__,  
 				      "don't know how to handle message header[%s]\n", 
 				      ChrPtr(HdrToken));
+			 */
 			break;
 		case 1:/* Message Mime Header */
 			if (StrLength(Buf) == 0) {
@@ -155,7 +139,7 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, in
 		case 2: /* Message Body */
 			
 			if (Msg->MsgBody->size_known > 0) {
-				StrBuf_ServGetBLOB(Msg->MsgBody->Data, Msg->MsgBody->length);
+				StrBuf_ServGetBLOBBuffered(Msg->MsgBody->Data, Msg->MsgBody->length);
 				state ++;
 				/*/ todo: check next line, if not 000, append following lines */
 			}
@@ -176,28 +160,6 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, in
 	/* now we put the body mimepart we read above into the mimelist */
 	Put(Msg->AllAttach, SKEY(Msg->MsgBody->PartNum), Msg->MsgBody, DestroyMime);
 	
-	/* strip the bare contenttype, so we ommit charset etc. */
-	StrBufExtract_token(Buf, Msg->MsgBody->ContentType, 0, ';');
-	StrBufTrim(Buf);
-	/* look up the renderer, that will convert this mimeitem into the htmlized form */
-	if (GetHash(MimeRenderHandler, SKEY(Buf), &vHdr) &&
-	    (vHdr != NULL)) {
-		RenderMimeFuncStruct *Render;
-		Render = (RenderMimeFuncStruct*)vHdr;
-		Render->f(Msg->MsgBody, NULL, FoundCharset);
-	}
-
-	if (StrLength(Msg->reply_references)> 0) {
-		/* Trim down excessively long lists of thread references.  We eliminate the
-		 * second one in the list so that the thread root remains intact.
-		 */
-		int rrtok = num_tokens(ChrPtr(Msg->reply_references), '|');
-		int rrlen = StrLength(Msg->reply_references);
-		if ( ((rrtok >= 3) && (rrlen > 900)) || (rrtok > 10) ) {
-			StrBufRemove_token(Msg->reply_references, 1, '|');
-		}
-	}
-
 	/* Generate a reply-to address */
 	if (StrLength(Msg->Rfca) > 0) {
 		if (Msg->reply_to == NULL)
@@ -230,6 +192,69 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, in
 			StrBufAppendBuf(Msg->reply_to, Msg->from, 0);
 		}
 	}
+	FreeStrBuf(&Buf);
+	FreeStrBuf(&HdrToken);
+	return 1;
+}
+
+
+
+/*
+ * I wanna SEE that message!
+ *
+ * msgnum		Message number to display
+ * printable_view	Nonzero to display a printable view
+ * section		Optional for encapsulated message/rfc822 submessage
+ */
+int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, const StrBuf *PartNum, const StrBuf **OutMime) 
+{
+	StrBuf *Buf;
+	StrBuf *FoundCharset;
+	HashPos  *it;
+	void *vMime;
+	message_summary *Msg = NULL;
+	void *vHdr;
+	long len;
+	const char *Key;
+	WCTemplputParams SubTP;
+	StrBuf *Error = NULL;
+
+	Buf = NewStrBuf();
+	FoundCharset = NewStrBuf();
+	Msg = (message_summary *)malloc(sizeof(message_summary));
+	memset(Msg, 0, sizeof(message_summary));
+	Msg->msgnum = msgnum;
+	Msg->PartNum = PartNum;
+	Msg->MsgBody =  (wc_mime_attachment*) malloc(sizeof(wc_mime_attachment));
+	memset(Msg->MsgBody, 0, sizeof(wc_mime_attachment));
+	Msg->MsgBody->msgnum = msgnum;
+
+	if (!load_message(Msg, FoundCharset, &Error)) {
+		StrBufAppendBuf(Target, Error, 0);
+		FreeStrBuf(&Error);
+	}
+
+	/* strip the bare contenttype, so we ommit charset etc. */
+	StrBufExtract_token(Buf, Msg->MsgBody->ContentType, 0, ';');
+	StrBufTrim(Buf);
+	/* look up the renderer, that will convert this mimeitem into the htmlized form */
+	if (GetHash(MimeRenderHandler, SKEY(Buf), &vHdr) &&
+	    (vHdr != NULL)) {
+		RenderMimeFuncStruct *Render;
+		Render = (RenderMimeFuncStruct*)vHdr;
+		Render->f(Msg->MsgBody, NULL, FoundCharset);
+	}
+
+	if (StrLength(Msg->reply_references)> 0) {
+		/* Trim down excessively long lists of thread references.  We eliminate the
+		 * second one in the list so that the thread root remains intact.
+		 */
+		int rrtok = num_tokens(ChrPtr(Msg->reply_references), '|');
+		int rrlen = StrLength(Msg->reply_references);
+		if ( ((rrtok >= 3) && (rrlen > 900)) || (rrtok > 10) ) {
+			StrBufRemove_token(Msg->reply_references, 1, '|');
+		}
+	}
 
 	/* now check if we need to translate some mimeparts, and remove the duplicate */
 	it = GetNewHashPos(Msg->AllAttach, 0);
@@ -242,17 +267,161 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, in
 	memset(&SubTP, 0, sizeof(WCTemplputParams));
 	SubTP.Filter.ContextType = CTX_MAILSUM;
 	SubTP.Context = Msg;
-	DoTemplate(tmpl, tmpllen, Target, &SubTP);
+	*OutMime = DoTemplate(tmpl, tmpllen, Target, &SubTP);
 
 	DestroyMessageSummary(Msg);
 	FreeStrBuf(&FoundCharset);
-	FreeStrBuf(&HdrToken);
 	FreeStrBuf(&Buf);
 	return 1;
 }
 
 
 
+void
+HttpStatus(long CitadelStatus)
+{
+	long httpstatus = 502;
+	long MajorStat = MAJORCODE(CitadelStatus);
+	long MinorStat = MINORCODE(CitadelStatus);
+	
+	switch (MAJORCODE(CitadelStatus))
+	{
+	case LISTING_FOLLOWS:
+	case CIT_OK:
+		httpstatus = 201;
+		break;
+	case ERROR:
+		switch (MINORCODE(CitadelStatus))
+		{
+		case INTERNAL_ERROR:
+			httpstatus = 403;
+			break;
+			
+		case TOO_BIG:
+		case ILLEGAL_VALUE:
+		case HIGHER_ACCESS_REQUIRED:
+		case MAX_SESSIONS_EXCEEDED:
+		case RESOURCE_BUSY:
+		case RESOURCE_NOT_OPEN:
+		case NOT_HERE:
+		case INVALID_FLOOR_OPERATION:
+		case FILE_NOT_FOUND:
+		case ROOM_NOT_FOUND:
+			httpstatus = 409;
+			break;
+
+		case MESSAGE_NOT_FOUND:
+		case ALREADY_EXISTS:
+			httpstatus = 403;
+			break;
+
+		case NO_SUCH_SYSTEM:
+			httpstatus = 502;
+			break;
+
+		default:
+		case CMD_NOT_SUPPORTED:
+		case PASSWORD_REQUIRED:
+		case ALREADY_LOGGED_IN:
+		case USERNAME_REQUIRED:
+		case NOT_LOGGED_IN:
+		case SERVER_SHUTTING_DOWN:
+		case NO_SUCH_USER:
+		case ASYNC_GEXP:
+			httpstatus = 502;
+			break;
+		}
+		break;
+
+	default:
+	case BINARY_FOLLOWS:
+	case SEND_BINARY:
+	case START_CHAT_MODE:
+	case ASYNC_MSG:
+	case MORE_DATA:
+	case SEND_LISTING:
+		httpstatus = 502; /* aeh... whut? */
+		break;
+	}
+
+
+}
+
+/*
+ * Unadorned HTML output of an individual message, suitable
+ * for placing in a hidden iframe, for printing, or whatever
+ *
+ * msgnum_as_string == Message number, as a string instead of as a long int
+ */
+void handle_one_message(void) 
+{
+	long CitStatus;
+	int CopyMessage = 0;
+	const StrBuf *Destination;
+	void *vLine;
+	const StrBuf *Mime;
+	long msgnum = 0L;
+	wcsession *WCC = WC;
+	const StrBuf *Tmpl;
+	StrBuf *CmdBuf = NULL;
+	const char *pMsg;
+
+
+	pMsg = strchr(ChrPtr(WCC->Hdr->HR.ReqLine), '/');
+	if (pMsg == NULL) {
+		HttpStatus(CitStatus);
+		return;
+	}
+
+	msgnum = atol(pMsg + 1);
+	StrBufCutAt(WCC->Hdr->HR.ReqLine, 0, pMsg);
+	gotoroom(WCC->Hdr->HR.ReqLine);
+	switch (WCC->Hdr->HR.eReqType)
+	{
+	case eGET:
+	case ePOST:
+		Tmpl = sbstr("template");
+		if (StrLength(Tmpl) > 0) 
+			read_message(WCC->WBuf, SKEY(Tmpl), msgnum, NULL, &Mime);
+		else 
+			read_message(WCC->WBuf, HKEY("view_message"), msgnum, NULL, &Mime);
+		http_transmit_thing(ChrPtr(Mime), 0);
+		break;
+	case eDELETE:
+		CmdBuf = NewStrBuf ();
+		if (WCC->wc_is_trash) {	/** Delete from Trash is a real delete */
+			serv_printf("DELE %ld", msgnum);	
+		}
+		else {			/** Otherwise move it to Trash */
+			serv_printf("MOVE %ld|_TRASH_|0", msgnum);
+		}
+		StrBuf_ServGetln(CmdBuf);
+		FlushStrBuf(WCC->ImportantMsg);
+		StrBufAppendBuf(WCC->ImportantMsg, CmdBuf, 4);
+		GetServerStatus(CmdBuf, &CitStatus);
+		HttpStatus(CitStatus);
+		break;
+	case eCOPY:
+		CopyMessage = 1;
+	case eMOVE:
+		if (GetHash(WCC->Hdr->HTTPHeaders, HKEY("DESTINATION"), &vLine) &&
+		    (vLine!=NULL)) {
+			Destination = (StrBuf*) vLine;
+			serv_printf("MOVE %ld|%s|%d", msgnum, ChrPtr(Destination), CopyMessage);
+			StrBuf_ServGetln(CmdBuf);
+			FlushStrBuf(WCC->ImportantMsg);
+			StrBufAppendBuf(WCC->ImportantMsg, CmdBuf, 4);
+			GetServerStatus(CmdBuf, &CitStatus);
+			HttpStatus(CitStatus);
+		}
+		else
+			HttpStatus(500);
+		break;
+	default:
+		break;
+
+	}
+}
 /*
  * Unadorned HTML output of an individual message, suitable
  * for placing in a hidden iframe, for printing, or whatever
@@ -260,15 +429,40 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, in
  * msgnum_as_string == Message number, as a string instead of as a long int
  */
 void embed_message(void) {
+	const StrBuf *Mime;
 	long msgnum = 0L;
 	wcsession *WCC = WC;
-	const StrBuf *Tmpl = sbstr("template");
+	const StrBuf *Tmpl;
+	StrBuf *CmdBuf = NULL;
 
-	msgnum = StrTol(WCC->UrlFragment2);
-	if (StrLength(Tmpl) > 0) 
-		read_message(WCC->WBuf, SKEY(Tmpl), msgnum, 0, NULL);
-	else 
-		read_message(WCC->WBuf, HKEY("view_message"), msgnum, 0, NULL);
+	msgnum = StrBufExtract_long(WCC->Hdr->HR.ReqLine, 0, '/');
+	switch (WCC->Hdr->HR.eReqType)
+	{
+	case eGET:
+	case ePOST:
+		Tmpl = sbstr("template");
+		if (StrLength(Tmpl) > 0) 
+			read_message(WCC->WBuf, SKEY(Tmpl), msgnum, NULL, &Mime);
+		else 
+			read_message(WCC->WBuf, HKEY("view_message"), msgnum, NULL, &Mime);
+		http_transmit_thing(ChrPtr(Mime), 0);
+		break;
+	case eDELETE:
+		CmdBuf = NewStrBuf ();
+		if (WCC->wc_is_trash) {	/** Delete from Trash is a real delete */
+			serv_printf("DELE %ld", msgnum);	
+		}
+		else {			/** Otherwise move it to Trash */
+			serv_printf("MOVE %ld|_TRASH_|0", msgnum);
+		}
+		StrBuf_ServGetln(CmdBuf);
+		FlushStrBuf(WCC->ImportantMsg);
+		StrBufAppendBuf(WCC->ImportantMsg, CmdBuf, 4);
+		break;
+	default:
+		break;
+
+	}
 }
 
 
@@ -279,8 +473,9 @@ void embed_message(void) {
  */
 void print_message(void) {
 	long msgnum = 0L;
+	const StrBuf *Mime;
 
-	msgnum = StrTol(WC->UrlFragment2);
+	msgnum = StrBufExtract_long(WC->Hdr->HR.ReqLine, 0, '/');
 	output_headers(0, 0, 0, 0, 0, 0);
 
 	hprintf("Content-type: text/html\r\n"
@@ -289,7 +484,7 @@ void print_message(void) {
 
 	begin_burst();
 
-	read_message(WC->WBuf, HKEY("view_message_print"), msgnum, 1, NULL);
+	read_message(WC->WBuf, HKEY("view_message_print"), msgnum, NULL, &Mime);
 
 	wDumpContent(0);
 }
@@ -299,14 +494,17 @@ void print_message(void) {
  *
  * @param msg_num_as_string Message number as a string instead of as a long int 
  */
-void mobile_message_view(void) {
-  long msgnum = 0L;
-  msgnum = StrTol(WC->UrlFragment2);
-  output_headers(1, 0, 0, 0, 0, 1);
-  begin_burst();
-  do_template("msgcontrols", NULL);
-  read_message(WC->WBuf, HKEY("view_message"), msgnum,1, NULL);
-  wDumpContent(0);
+void mobile_message_view(void) 
+{
+	long msgnum = 0L;
+	const StrBuf *Mime;
+  
+	msgnum = StrBufExtract_long(WC->Hdr->HR.ReqLine, 0, '/');
+	output_headers(1, 0, 0, 0, 0, 1);
+	begin_burst();
+	do_template("msgcontrols", NULL);
+	read_message(WC->WBuf, HKEY("view_message"), msgnum, NULL, &Mime);
+	wDumpContent(0);
 }
 
 /**
@@ -318,7 +516,7 @@ void display_headers(void) {
 	long msgnum = 0L;
 	char buf[1024];
 
-	msgnum = StrTol(WC->UrlFragment2);
+	msgnum = StrBufExtract_long(WC->Hdr->HR.ReqLine, 0, '/');
 	output_headers(0, 0, 0, 0, 0, 0);
 
 	hprintf("Content-type: text/plain\r\n"
@@ -388,7 +586,7 @@ message_summary *ReadOneMessageSummary(StrBuf *RawMessage, const char *DefaultSu
  * servcmd:		the citadel command to send to the citserver
  * with_headers:	also include some of the headers with the message numbers (more expensive)
  */
-int load_msg_ptrs(char *servcmd, int with_headers)
+int load_msg_ptrs(const char *servcmd, int with_headers)
 {
 	StrBuf* FoundCharset = NULL;
         wcsession *WCC = WC;
@@ -399,7 +597,7 @@ int load_msg_ptrs(char *servcmd, int with_headers)
 	long len;
 	int n;
 	int skipit;
-	const char *Ptr;
+	const char *Ptr = NULL;
 
 	if (WCC->summ != NULL) {
 		DeleteHash(&WCC->summ);
@@ -409,13 +607,13 @@ int load_msg_ptrs(char *servcmd, int with_headers)
 	
 	Buf = NewStrBuf();
 	serv_puts(servcmd);
-	StrBuf_ServGetlnBuffered(Buf);
+	StrBuf_ServGetln(Buf);
 	if (GetServerStatus(Buf, NULL) != 1) {
 		FreeStrBuf(&Buf);
 		return (nummsgs);
 	}
 	Buf2 = NewStrBuf();
-	while (len = StrBuf_ServGetlnBuffered(Buf),
+	while (len = StrBuf_ServGetln(Buf),
 	       ((len != 3)  ||
 		strcmp(ChrPtr(Buf), "000")!= 0))
 	{
@@ -521,7 +719,7 @@ long DrawMessageDropdown(StrBuf *Selector, long maxmsgs, long startmsg, int nMes
 	memset(&SubTP, 0, sizeof(WCTemplputParams));
 	SubTP.Filter.ContextType = CTX_LONGVECTOR;
 	SubTP.Context = &vector;
-	TmpBuf = NewStrBuf();
+	TmpBuf = NewStrBufPlain(NULL, SIZ);
 	At = GetNewHashPos(WCC->summ, nMessages);
 	nItems = GetCount(WCC->summ);
 	ret = nMessages;
@@ -666,14 +864,15 @@ void readloop(long oper)
 	int defaultsortorder = 0;
 	WCTemplputParams SubTP;
 	char *ab_name;
+	const StrBuf *Mime;
 
 	if (havebstr("is_summary") && (1 == (ibstr("is_summary"))))
 		WCC->wc_view = VIEW_MAILBOX;
 
 	if (!WCC->is_ajax) {
-	output_headers(1, 1, 1, 0, 0, 0);
+		output_headers(1, 1, 1, 0, 0, 0);
 	} else if (WCC->wc_view == VIEW_MAILBOX) {
-	  jsonMessageListHdr();
+		jsonMessageListHdr();
 	}
 
 	switch (WCC->wc_view) {
@@ -684,7 +883,7 @@ void readloop(long oper)
 	case VIEW_CALBRIEF:
 	case VIEW_CALENDAR:
 		load_seen = 1;
-		strcpy(cmd, "MSGS ALL|||1");
+		strcpy(cmd, "MSGS ALL");
 		maxmsgs = 32767;
 		parse_calendar_view_request(&calv);
 		break;
@@ -801,8 +1000,8 @@ void readloop(long oper)
 	 */
 	switch (WCC->wc_view) {
 	case VIEW_BBS:
-		BBViewToolBar = NewStrBuf();
-		MessageDropdown = NewStrBuf();
+		BBViewToolBar = NewStrBufPlain(NULL, SIZ);
+		MessageDropdown = NewStrBufPlain(NULL, SIZ);
 
 		maxmsgs = DrawMessageDropdown(MessageDropdown, maxmsgs, startmsg, num_displayed);
 		if (num_displayed < 0) {
@@ -857,6 +1056,8 @@ void readloop(long oper)
 			case VIEW_ADDRESSBOOK:
 				ab_name = NULL;
 				fetch_ab_name(Msg, &ab_name);
+				if (ab_name == NULL) 
+					break;
 				++num_ab;
 				addrbook = realloc(addrbook,
 						   (sizeof(addrbookent) * num_ab) );
@@ -897,7 +1098,7 @@ void readloop(long oper)
 			/** if we do a split bbview in the future, begin messages div here */
 			
 			for (a=0; a<num_displayed; ++a) {
-				read_message(WCC->WBuf, HKEY("view_message"), displayed_msgs[a], 0, NULL);
+				read_message(WCC->WBuf, HKEY("view_message"), displayed_msgs[a], NULL, &Mime);
 			}
 			
 			/** if we do a split bbview in the future, end messages div here */
@@ -931,7 +1132,7 @@ DONE:
 		break;
 	case VIEW_ADDRESSBOOK:
 		if (is_singlecard)
-			read_message(WC->WBuf, HKEY("view_message"), lbstr("startmsg"), 0, NULL);
+			read_message(WC->WBuf, HKEY("view_message"), lbstr("startmsg"), NULL, &Mime);
 		else
 			do_addrbook_view(addrbook, num_ab);	/** Render the address book */
 		break;
@@ -1160,9 +1361,10 @@ void post_message(void)
 		{
 			const StrBuf *ref = sbstr("references");
 			references = NewStrBufPlain(ChrPtr(ref), StrLength(ref));
-			lprintf(9, "Converting: %s\n", ChrPtr(references));
+			if (*ChrPtr(references) == '|') {	/* remove leading '|' if present */
+				StrBufCutLeft(references, 1);
+			}
 			StrBufReplaceChars(references, '|', '!');
-			lprintf(9, "Converted: %s\n", ChrPtr(references));
 		}
 		if (havebstr("subject")) {
 			const StrBuf *Subj;
@@ -1304,7 +1506,7 @@ void display_enter(void)
 	 * message" command really means "add new entry."
 	 */
 	if (WCC->wc_default_view == VIEW_ADDRESSBOOK) {
-		do_edit_vcard(-1, "", "", ChrPtr(WCC->wc_roomname));
+		do_edit_vcard(-1, "", NULL, NULL, "",  ChrPtr(WCC->wc_roomname));
 		return;
 	}
 
@@ -1514,7 +1716,6 @@ void postpart(StrBuf *partnum, StrBuf *filename, int force_download)
 		else {
 			content_type = NewStrBufDup(part->ContentType);
 		}
-		output_headers(0, 0, 0, 0, 0, 0);
 		StrBufAppendBuf(WC->WBuf, part->Data, 0);
 		http_transmit_thing(ChrPtr(content_type), 0);
 	} else {
@@ -1539,71 +1740,76 @@ void postpart(StrBuf *partnum, StrBuf *filename, int force_download)
  */
 void mimepart(int force_download)
 {
+	long msgnum, att;
 	wcsession *WCC = WC;
-
-	char buf[256];
+	StrBuf *Buf;
 	off_t bytes;
-	char content_type[256];
-	const char *ContentType = &content_type[0];
+	StrBuf *ContentType = NewStrBufPlain(HKEY("application/octet-stream"));
+	const char *CT;
 
-	serv_printf("OPNA %s|%s", ChrPtr(WCC->UrlFragment2), ChrPtr(WCC->UrlFragment3));
-	serv_getln(buf, sizeof buf);
-	if (buf[0] == '2') {
-		bytes = extract_long(&buf[4], 0);
-		if (force_download) {
-			strcpy(content_type, "application/octet-stream");
-		}
-		else {
-			extract_token(content_type, &buf[4], 3, '|', sizeof content_type);
+	msgnum = StrBufExtract_long(WCC->Hdr->HR.ReqLine, 0, '/');
+	att = StrBufExtract_long(WCC->Hdr->HR.ReqLine, 1, '/');
+
+	Buf = NewStrBuf();
+	serv_printf("OPNA %ld|%ld", msgnum, att);
+	StrBuf_ServGetln(Buf);
+	if (GetServerStatus(Buf, NULL) == 2) {
+		StrBufCutLeft(Buf, 4);
+		bytes = StrBufExtract_long(Buf, 0, '|');
+		if (!force_download) {
+			StrBufExtract_token(ContentType, Buf, 3, '|');
 		}
 
-		read_server_binary(WCC->WBuf, bytes);
+		read_server_binary(WCC->WBuf, bytes, Buf);
 		serv_puts("CLOS");
-		serv_getln(buf, sizeof buf);
+		StrBuf_ServGetln(Buf);
+		CT = ChrPtr(ContentType);
 
 		if (!force_download) {
-			if (!strcasecmp(ContentType, "application/octet-stream")) {
-				ContentType = GuessMimeByFilename(SKEY(WCC->UrlFragment4));
+			if (!strcasecmp(ChrPtr(ContentType), "application/octet-stream")) {
+				StrBufExtract_token(Buf, WCC->Hdr->HR.ReqLine, 2, '/');
+				CT = GuessMimeByFilename(SKEY(Buf));
 			}
-			if (!strcasecmp(ContentType, "application/octet-stream")) {
-				ContentType = GuessMimeType(SKEY(WCC->WBuf));
+			if (!strcasecmp(ChrPtr(ContentType), "application/octet-stream")) {
+				CT = GuessMimeType(SKEY(WCC->WBuf));
 			}
 		}
-		output_headers(0, 0, 0, 0, 0, 0);
-		http_transmit_thing(ContentType, 0);
+		http_transmit_thing(CT, 0);
 	} else {
-		hprintf("HTTP/1.1 404 %s\n", &buf[4]);
+		StrBufCutLeft(Buf, 4);
+		hprintf("HTTP/1.1 404 %s\n", ChrPtr(Buf));
 		output_headers(0, 0, 0, 0, 0, 0);
 		hprintf("Content-Type: text/plain\r\n");
-		wprintf(_("An error occurred while retrieving this part: %s\n"), &buf[4]);
+		wprintf(_("An error occurred while retrieving this part: %s\n"), 
+			ChrPtr(Buf));
 		end_burst();
 	}
+	FreeStrBuf(&ContentType);
+	FreeStrBuf(&Buf);
 }
 
 
 /*
  * Read any MIME part of a message, from the server, into memory.
  */
-char *load_mimepart(long msgnum, char *partnum)
+StrBuf *load_mimepart(long msgnum, char *partnum)
 {
-	char buf[SIZ];
 	off_t bytes;
-	char content_type[SIZ];
-	char *content;
+	StrBuf *Buf;
 	
+	Buf = NewStrBuf();
 	serv_printf("DLAT %ld|%s", msgnum, partnum);
-	serv_getln(buf, sizeof buf);
-	if (buf[0] == '6') {
-		bytes = extract_long(&buf[4], 0);
-		extract_token(content_type, &buf[4], 3, '|', sizeof content_type);
-
-		content = malloc(bytes + 2);
-		serv_read(content, bytes);
-
-		content[bytes] = 0;	/* null terminate for good measure */
-		return(content);
+	StrBuf_ServGetln(Buf);
+	if (GetServerStatus(Buf, NULL) == 6) {
+		StrBufCutLeft(Buf, 4);
+		bytes = StrBufExtract_long(Buf, 0, '|');
+		FreeStrBuf(&Buf);
+		Buf = NewStrBuf();
+		StrBuf_ServGetBLOBBuffered(Buf, bytes);
+		return(Buf);
 	}
 	else {
+		FreeStrBuf(&Buf);
 		return(NULL);
 	}
 }
@@ -1613,23 +1819,24 @@ char *load_mimepart(long msgnum, char *partnum)
  */
 void MimeLoadData(wc_mime_attachment *Mime)
 {
-	char buf[SIZ];
+	StrBuf *Buf;
 	off_t bytes;
 /* TODO: is there a chance the contenttype is different  to the one we know?	 */
 	serv_printf("DLAT %ld|%s", Mime->msgnum, ChrPtr(Mime->PartNum));
-	serv_getln(buf, sizeof buf);
-	if (buf[0] == '6') {
-		bytes = extract_long(&buf[4], 0);
-
+	Buf = NewStrBuf();
+	StrBuf_ServGetln(Buf);
+	if (GetServerStatus(Buf, NULL) == 6) {
+		bytes = extract_long(&(ChrPtr(Buf)[4]), 0);
+				     
 		if (Mime->Data == NULL)
 			Mime->Data = NewStrBufPlain(NULL, bytes);
-		StrBuf_ServGetBLOB(Mime->Data, bytes);
-
+		StrBuf_ServGetBLOBBuffered(Mime->Data, bytes);
 	}
 	else {
 		FlushStrBuf(Mime->Data);
 		/* TODO XImportant message */
 	}
+	FreeStrBuf(&Buf);
 }
 
 
@@ -1644,15 +1851,29 @@ void download_mimepart(void) {
 }
 
 void view_postpart(void) {
-	postpart(WC->UrlFragment2,
-		 WC->UrlFragment3,
-		 0);
+	StrBuf *filename = NewStrBuf();
+	StrBuf *partnum = NewStrBuf();
+
+	StrBufExtract_token(partnum, WC->Hdr->HR.ReqLine, 0, '/');
+	StrBufExtract_token(filename, WC->Hdr->HR.ReqLine, 1, '/');
+
+	postpart(partnum, filename, 0);
+
+	FreeStrBuf(&filename);
+	FreeStrBuf(&partnum);
 }
 
 void download_postpart(void) {
-	postpart(WC->UrlFragment2,
-		 WC->UrlFragment3,
-		 1);
+	StrBuf *filename = NewStrBuf();
+	StrBuf *partnum = NewStrBuf();
+
+	StrBufExtract_token(partnum, WC->Hdr->HR.ReqLine, 0, '/');
+	StrBufExtract_token(filename, WC->Hdr->HR.ReqLine, 1, '/');
+
+	postpart(partnum, filename, 1);
+
+	FreeStrBuf(&filename);
+	FreeStrBuf(&partnum);
 }
 
 void h_readnew(void) { readloop(readnew);}
@@ -1722,7 +1943,8 @@ InitModule_MSG
 	WebcitAddUrlHandler(HKEY("move_msg"), move_msg, 0);
 	WebcitAddUrlHandler(HKEY("delete_msg"), delete_msg, 0);
 	WebcitAddUrlHandler(HKEY("confirm_move_msg"), confirm_move_msg, 0);
-	WebcitAddUrlHandler(HKEY("msg"), embed_message, NEED_URL|AJAX);
+	WebcitAddUrlHandler(HKEY("msg"), embed_message, NEED_URL);
+	WebcitAddUrlHandler(HKEY("message"), handle_one_message, NEED_URL|XHTTP_COMMANDS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE);
 	WebcitAddUrlHandler(HKEY("printmsg"), print_message, NEED_URL);
 	WebcitAddUrlHandler(HKEY("mobilemsg"), mobile_message_view, NEED_URL);
 	WebcitAddUrlHandler(HKEY("msgheaders"), display_headers, NEED_URL);
@@ -1736,3 +1958,10 @@ InitModule_MSG
 	WebcitAddUrlHandler(HKEY("roommsgs"), jsonMessageList,0);
 	return ;
 }
+
+void
+SessionDetachModule_MSG
+(wcsession *sess)
+{
+	DeleteHash(&sess->summ);
+}