From b5abbc0cbce5815735d840debdffeb636cbfeb1a Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Sun, 28 Mar 2010 17:52:34 +0000
Subject: - Re-organize editor buttons, add blockquote and search buttons -
 Make possible to write inside or after a quoted html message (#1485476)

git-svn-id: https://svn.roundcube.net/trunk@3435 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/steps/mail/compose.inc  | 2 +-
 roundcubemail/program/steps/mail/sendmail.inc | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'roundcubemail/program/steps')

diff --git a/roundcubemail/program/steps/mail/compose.inc b/roundcubemail/program/steps/mail/compose.inc
index 07659307c..bf245038a 100644
--- a/roundcubemail/program/steps/mail/compose.inc
+++ b/roundcubemail/program/steps/mail/compose.inc
@@ -613,7 +613,7 @@ function rcmail_create_reply_body($body, $bodyIsHtml)
     $prefix = sprintf("<p>On %s, %s wrote:</p>\n",
       $MESSAGE->headers->date,
       htmlspecialchars(Q($MESSAGE->get_header('from'), 'replace'), ENT_COMPAT, $RCMAIL->output->get_charset()));
-    $prefix .= '<blockquote type="cite" style="padding-left:5px; border-left:#1010ff 2px solid; margin-left:5px; width:100%">';
+    $prefix .= '<blockquote>';
 
     if ($RCMAIL->config->get('top_posting')) {
       $prefix = '<br>' . $prefix;
diff --git a/roundcubemail/program/steps/mail/sendmail.inc b/roundcubemail/program/steps/mail/sendmail.inc
index 13210be68..d6ef159dd 100644
--- a/roundcubemail/program/steps/mail/sendmail.inc
+++ b/roundcubemail/program/steps/mail/sendmail.inc
@@ -366,10 +366,15 @@ $isHtml = ($isHtmlVal == "1");
 $message_body = get_input_value('_message', RCUBE_INPUT_POST, TRUE, $message_charset);
 
 if (!$savedraft) {
-  // remove signature's div ID
-  if ($isHtml)
+  if ($isHtml) {
+    // remove signature's div ID
     $message_body = preg_replace('/\s*id="_rc_sig"/', '', $message_body);
 
+    // add inline css for blockquotes
+    $bstyle = 'padding-left:5px; border-left:#1010ff 2px solid; margin-left:5px; width:100%';
+    $message_body = preg_replace('/<blockquote>/',
+	'<blockquote type="cite" style="'.$bstyle.'">', $message_body);
+  }
   // generic footer for all messages
   if (!empty($CONFIG['generic_message_footer'])) {
     $footer = file_get_contents(realpath($CONFIG['generic_message_footer']));
-- 
cgit v1.2.3