* apply samjams edit drafts patch. Modification: use force_room instead of creating...

diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c
index 1c0840f64267bee17c66d421b02967fac58a0781..9bdd2b322ca13f87e4e9de03d1acdeff66242c64 100644 (file)
--- a/webcit/msg_renderers.c
+++ b/webcit/msg_renderers.c
@@ -788,6 +788,19 @@ void tmplput_QUOTED_MAIL_BODY(StrBuf *Target, WCTemplputParams *TP)
        FreeStrBuf(&Buf);
 }
 
+void tmplput_EDIT_MAIL_BODY(StrBuf *Target, WCTemplputParams *TP)
+{
+       const StrBuf *Mime;
+        long MsgNum;
+       StrBuf *Buf;
+
+       MsgNum = LBstr(TKEY(0));
+       Buf = NewStrBuf();
+       read_message(Buf, HKEY("view_message_edit"), MsgNum, NULL, &Mime);
+       StrBufAppendTemplate(Target, TP, Buf, 1);
+       FreeStrBuf(&Buf);
+}
+
 void tmplput_MAIL_BODY(StrBuf *Target, WCTemplputParams *TP)
 {
        message_summary *Msg = (message_summary*) CTX;
@@ -1170,6 +1183,7 @@ InitModule_MSGRENDERERS
        RegisterNamespace("MAIL:SUMM:INREPLYTO", 0, 2, tmplput_MAIL_SUMM_INREPLYTO,  CTX_MAILSUM);
        RegisterNamespace("MAIL:BODY", 0, 2, tmplput_MAIL_BODY,  CTX_MAILSUM);
        RegisterNamespace("MAIL:QUOTETEXT", 1, 2, tmplput_QUOTED_MAIL_BODY,  CTX_NONE);
+       RegisterNamespace("MAIL:EDITTEXT", 1, 2, tmplput_EDIT_MAIL_BODY,  CTX_NONE);
        RegisterConditional(HKEY("COND:MAIL:SUMM:RFCA"), 0, Conditional_MAIL_SUMM_RFCA,  CTX_MAILSUM);
        RegisterConditional(HKEY("COND:MAIL:SUMM:CCCC"), 0, Conditional_MAIL_SUMM_CCCC,  CTX_MAILSUM);
        RegisterConditional(HKEY("COND:MAIL:SUMM:UNREAD"), 0, Conditional_MAIL_SUMM_UNREAD, CTX_MAILSUM);

diff --git a/webcit/static/t/edit_message.html b/webcit/static/t/edit_message.html
index 714c88c96769971b279dc513ea5c9b40807268bf..19b76728cc4c4c0e781e3f247f13098dc98d7983 100644 (file)
--- a/webcit/static/t/edit_message.html
+++ b/webcit/static/t/edit_message.html
@@ -99,13 +99,18 @@
     <?MAIL:QUOTETEXT("replyquote", "X")>
 &lt;br /&gt;
 <?!("X", 2)>
-<??("COND:BSTR", 3, "sig_inserted", "yes")>
-  <?!("COND:PREF", 4, "use_sig", "yes")>
-    &lt;br&gt;&lt;p&gt;--&nbsp;&lt;br&gt;
-    <?PREF:VALUE("signature","H")>
-    &lt;/p&gt;
-  <?!("X", 4)>
-<??("X", 3)>
+<?!("COND:BSTR", 3, "edit")>
+    <?MAIL:EDITTEXT("edit", "X")>
+<?!("X", 3)>
+<??("COND:BSTR", 4, "edit")>
+  <??("COND:BSTR", 5, "sig_inserted", "yes")>
+    <?!("COND:PREF", 6, "use_sig", "yes")>
+      &lt;br&gt;&lt;p&gt;--&nbsp;&lt;br&gt;
+      <?PREF:VALUE("signature","H")>
+      &lt;/p&gt;
+    <?!("X", 6)>
+  <??("X", 5)>
+<?!("X", 4)>
 </textarea>
 <?=("richedit")>
 

diff --git a/webcit/static/t/view_message.html b/webcit/static/t/view_message.html
index 6c557b9f3213ff72582794ced3b08e0d9a4515a1..6d3db5d7477eee8ce4a3b44f0858660960e944cc 100644 (file)
--- a/webcit/static/t/view_message.html
+++ b/webcit/static/t/view_message.html
@@ -15,6 +15,7 @@ onMouseOut=document.getElementById("msg<?MAIL:SUMM:N>").style.visibility="hidden
 <?!("COND:MAIL:SUMM:CCCC", 6)><?_("CC:")><?MAIL:SUMM:CCCC("X")><??("X", 6)>
 <?!("COND:MAIL:SUBJ", 7)><p class="message_subject"><?_("Subject:")> <?MAIL:SUMM:SUBJECT("X")></p><??("X", 7)>
  <p style="visibility: hidden;" id="msg<?MAIL:SUMM:N>" class="msgbuttons">
+ <a href="display_enter?edit=<?MAIL:SUMM:N>&recp=<?MAIL:SUMM:TO("U")>&cc=<?MAIL:SUMM:CCCC("U")>&subject=<?MAIL:SUMM:SUBJECT("U", 0, "", "")>&force_room=_MAIL_"><span>[</span><?_("Edit")><span>]</span></a> 
 <?!("COND:ROOM:TYPE_IS", 8, "VIEW_BBS")>
    <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%20", "Re:")>"><span>[</span><?_("Reply")><span>]</span></a> 
    <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?replyquote=<?MAIL:SUMM:N>&recp=%22<?MAIL:SUMM:FROM("U")>%22%3C<?MAIL:SUMM:RFCA("U")>%3E?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%%20", "Re:")>"><span>[</span><?_("ReplyQuoted")><span>]</span></a>