summaryrefslogtreecommitdiff
path: root/program/steps/mail
diff options
context:
space:
mode:
authorThomas B. <thomas@roundcube.net>2013-09-16 10:47:24 -0700
committerThomas B. <thomas@roundcube.net>2013-09-16 10:47:24 -0700
commit0201298cd8f767389789f7c35897985d4475836a (patch)
tree49ba49fade3e2dd998a569e1694c5e31ad301af3 /program/steps/mail
parentb5c364273d7b026c0deda2326018aabff8bec73c (diff)
parent153e455f6566cb7a4349b7f2197e842d6ec9bf90 (diff)
Merge pull request #118 from Dennis1993/patch-12
Added support for default font size and fix legacy code for default font
Diffstat (limited to 'program/steps/mail')
-rw-r--r--program/steps/mail/compose.inc3
-rw-r--r--program/steps/mail/sendmail.inc6
2 files changed, 7 insertions, 2 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 39dca3b03..30c9f79fb 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -148,6 +148,9 @@ if ($font && !is_array($font)) {
$OUTPUT->set_env('default_font', $font);
}
+// default font size for HTML editor
+$OUTPUT->set_env('default_font_size', $RCMAIL->config->get('default_font_size'));
+
// get reference message and set compose mode
if ($msg_uid = $COMPOSE['param']['draft_uid']) {
$compose_mode = RCUBE_COMPOSE_DRAFT;
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 779fb87cd..8fe149611 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -473,8 +473,10 @@ $isHtml = (bool) get_input_value('_is_html', RCUBE_INPUT_POST);
$message_body = get_input_value('_message', RCUBE_INPUT_POST, TRUE, $message_charset);
if ($isHtml) {
- $font = rcube_fontdefs($RCMAIL->config->get('default_font'));
- $bstyle = $font && is_string($font) ? " style='font-family: $font'" : '';
+ $font = rcube_fontdefs($RCMAIL->config->get('default_font'));
+ $font = $font && is_string($font) ? ' '.$font : NULL;
+ $font_size = $RCMAIL->config->get('default_font_size');
+ $bstyle = " style='font: ".$font_size.$font.";'";
// append doctype and html/body wrappers
$message_body = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">' .