From: Art Cancro <ajc@citadel.org>
Date: Wed, 28 Sep 2005 03:19:14 +0000 (+0000)
Subject: * "Reply" and "ReplyAll" now quote the original message, but only when
X-Git-Tag: v7.86~4602
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=ab3a5efd9b110402c8a099f3d5ba4182518b9899;p=citadel.git

* "Reply" and "ReplyAll" now quote the original message, but only when
  it's private mail.
* For non-mail, a "ReplyQuoted" button is now present.
* "Move" and "Delete" are now present for a user's mailbox rooms.
* Improved the <blockquote> style.
---

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 686a86dc3..726a45b5f 100644
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,11 @@
 $Log$
+Revision 625.27  2005/09/28 03:19:13  ajc
+* "Reply" and "ReplyAll" now quote the original message, but only when
+  it's private mail.
+* For non-mail, a "ReplyQuoted" button is now present.
+* "Move" and "Delete" are now present for a user's mailbox rooms.
+* Improved the <blockquote> style.
+
 Revision 625.26  2005/09/27 02:12:13  ajc
 * When clicking on an email address in a vCard to send the person an
   email message, use the display name plus the email address.
@@ -3074,3 +3081,4 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
 	* webserver.c: warning fix
+
diff --git a/webcit/messages.c b/webcit/messages.c
index 47a277f1b..23638c82b 100644
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -713,16 +713,38 @@ void read_message(long msgnum, int printable_view) {
 		wprintf("<td align=right>\n");
 
 		/* Reply */
-		wprintf("<a href=\"/display_enter?recp=");
-		urlescputs(reply_to);
-		wprintf("?subject=");
-		if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
-		urlescputs(m_subject);
-		wprintf("\">[%s]</a> ", _("Reply"));
+		if ( (WC->wc_view == VIEW_MAILBOX) || (WC->wc_view == VIEW_BBS) ) {
+			wprintf("<a href=\"/display_enter");
+			if (WC->is_mailbox) {
+				wprintf("?replyquote=%ld", msgnum);
+			}
+			wprintf("?recp=");
+			urlescputs(reply_to);
+			wprintf("?subject=");
+			if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
+			urlescputs(m_subject);
+			wprintf("\">[%s]</a> ", _("Reply"));
+		}
+
+		/* ReplyQuoted */
+		if ( (WC->wc_view == VIEW_MAILBOX) || (WC->wc_view == VIEW_BBS) ) {
+			if (!WC->is_mailbox) {
+				wprintf("<a href=\"/display_enter");
+				wprintf("?replyquote=%ld", msgnum);
+				wprintf("?recp=");
+				urlescputs(reply_to);
+				wprintf("?subject=");
+				if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
+				urlescputs(m_subject);
+				wprintf("\">[%s]</a> ", _("ReplyQuoted"));
+			}
+		}
 
 		/* ReplyAll */
 		if (WC->wc_view == VIEW_MAILBOX) {
-			wprintf("<a href=\"/display_enter?recp=");
+			wprintf("<a href=\"/display_enter");
+			wprintf("?replyquote=%ld", msgnum);
+			wprintf("?recp=");
 			urlescputs(reply_to);
 			wprintf("?cc=");
 			urlescputs(reply_all);
@@ -734,7 +756,7 @@ void read_message(long msgnum, int printable_view) {
 
 		/* Forward */
 		if (WC->wc_view == VIEW_MAILBOX) {
-			wprintf("<a href=\"/display_enter?pullquote=%ld?subject=", msgnum);
+			wprintf("<a href=\"/display_enter?fwdquote=%ld?subject=", msgnum);
 			if (strncasecmp(m_subject, "Fwd:", 4)) wprintf("Fwd:%20");
 			urlescputs(m_subject);
 			wprintf("\">[%s]</a> ", _("Forward"));
@@ -1206,7 +1228,7 @@ ENDBODY:
 	 * If there were attachments, we have to download them and insert them
 	 * into the attachment chain for the forwarded message we are composing.
 	 */
-	if (num_attachments) {
+	if ( (forward_attachments) && (num_attachments) ) {
 		for (i=0; i<num_attachments; ++i) {
 			extract_token(buf, attachments, i, '\n', sizeof buf);
                         extract_token(mime_filename, buf, 1, '|', sizeof mime_filename);
@@ -2496,11 +2518,17 @@ void display_enter(void)
 	wprintf("<textarea name=\"msgtext\" cols=\"80\" rows=\"15\">");
 
 	msgescputs(bstr("msgtext"));
-	if (atol(bstr("pullquote")) > 0L) {
+	if (atol(bstr("fwdquote")) > 0L) {
 		wprintf("<br><div align=center><i>");
 		wprintf(_("--- forwarded message ---"));
 		wprintf("</i></div><br>");
-		pullquote_message(atol(bstr("pullquote")), 1);
+		pullquote_message(atol(bstr("fwdquote")), 1);
+	}
+	else if (atol(bstr("replyquote")) > 0L) {
+		wprintf("<br>"
+			"<blockquote>");
+		pullquote_message(atol(bstr("replyquote")), 0);
+		wprintf("</blockquote>");
 	}
 	wprintf("</textarea>");
 	wprintf("</center><br />\n");
diff --git a/webcit/static/webcit.css b/webcit/static/webcit.css
index 92b784e72..e96ee17ab 100644
--- a/webcit/static/webcit.css
+++ b/webcit/static/webcit.css
@@ -326,10 +326,21 @@ a:hover {
 	color: #000088;
 }
 
+/* Quote Levels Colors */
 blockquote {
-	margin-left: 8%;
-	margin-right: 8%;
-	border: thin ridge #dc143c;
+	color: navy !important; background-color: RGB(245,245,245) !important; 
+}
+blockquote blockquote {
+	color: maroon !important; background-color: RGB(235,235,235) !important;
+}
+blockquote blockquote blockquote {
+	color: green !important; background-color: RGB(225,225,225) !important;
+}
+blockquote blockquote blockquote blockquote {
+	color: purple !important; background-color: RGB(215,215,215) !important;
+}
+blockquote blockquote blockquote blockquote blockquote {
+	color: teal !important; background-color: RGB(205,205,205) !important;
 }
 
 blockquote pre {