* fix attachments forwarding

diff --git a/webcit/messages.c b/webcit/messages.c
index a3e44fddd801a8826f3d4348dbe37612c9515c1d..dfe8d92373218c1600507ffe5249b2259353d48f 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -1591,7 +1591,7 @@ void post_message(void)
                             ChrPtr(references));
                FreeStrBuf(&references);
 
-               lprintf(9, "%s\n", CmdBuf);
+               lprintf(9, "%s\n", ChrPtr(CmdBuf));
                serv_puts(ChrPtr(CmdBuf));
                serv_getln(buf, sizeof buf);
                FreeStrBuf(&CmdBuf);

diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c
index 9531aa83ac6e6d44a655dbbc335693d21635429d..15c8b953de6d07ca0a91963de6b9ec19b0ebfd7c 100644 (file)
--- a/webcit/msg_renderers.c
+++ b/webcit/msg_renderers.c
@@ -927,6 +927,9 @@ void tmplput_MIME_LoadData(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, v
                memcpy(att, mime, sizeof(wc_mime_attachment));
                memset(mime, 0, sizeof(wc_mime_attachment));
 
+               if (att->Data == NULL) 
+                       MimeLoadData(att);
+
                if (WCC->attachments == NULL)
                        WCC->attachments = NewHash(1, NULL);
                /* And add it to the list. */

diff --git a/webcit/static/t/load_attachments.html b/webcit/static/t/load_attachments.html
index 2e89c639c0649d6e3652ee4ce4c9979aaea8bd8b..6f6313f81749949db4d9372a9e80657607d2a2a3 100644 (file)
--- a/webcit/static/t/load_attachments.html
+++ b/webcit/static/t/load_attachments.html
@@ -1,3 +1 @@
---------------------------------------------------------------------------------
 <?MAIL:MIME:LOADDATA>
---------------------------------------------------------------------------------

diff --git a/webcit/static/t/section_attach_select.html b/webcit/static/t/section_attach_select.html
index 241ea279590c5a4a846d9a3ebb800fa403a1b8fb..7247d354859a0a95b3c8bac51000767e8dba15d2 100644 (file)
--- a/webcit/static/t/section_attach_select.html
+++ b/webcit/static/t/section_attach_select.html
@@ -1,2 +1,2 @@
-<option value="<?ATT:FILENAME("U")>"><?ATT:FILENAME("X")> (%<?ATT:TYPE>, <?ATT:SIZE></option>
+<option value="<?ATT:FILENAME("U")>"><?ATT:FILENAME("X")> (<?ATT:TYPE>, <?ATT:SIZE>)</option>