summaryrefslogtreecommitdiff
path: root/program/steps
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-03-28 17:52:34 +0000
committeralecpl <alec@alec.pl>2010-03-28 17:52:34 +0000
commit7a48e5539f2d2f1346d9f87a3c06c281a3078aa1 (patch)
treea1187d4eae8a0f8f58124dd1828f49242bcf78c2 /program/steps
parent79990754f61617615cc30a2470672c7db3658e7d (diff)
- Re-organize editor buttons, add blockquote and search buttons
- Make possible to write inside or after a quoted html message (#1485476)
Diffstat (limited to 'program/steps')
-rw-r--r--program/steps/mail/compose.inc2
-rw-r--r--program/steps/mail/sendmail.inc9
2 files changed, 8 insertions, 3 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 07659307c..bf245038a 100644
--- a/program/steps/mail/compose.inc
+++ b/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/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 13210be68..d6ef159dd 100644
--- a/program/steps/mail/sendmail.inc
+++ b/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']));