From c1ff572e176dc930c52063e53364daa315d34666 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Mon, 16 Sep 2013 14:01:10 -0400
Subject: [PATCH] Touch new default font size settings: simplified + codestyle + updated changelog
---
CHANGELOG | 1 +
program/steps/settings/func.inc | 4 ++--
program/steps/mail/sendmail.inc | 5 ++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index f18d10d..8d5870c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Make default font size for HTML messages configurable (request #118)
- Display full attachment name using title attribute when name is too long to display (#1489320)
- Fix XSS issue in addressbook group name field [CVE-2013-5646] (#1489333)
- Fix attachment icon issue when rare font/language is used (#1489326)
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 8fe1496..3f4475e 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -473,10 +473,9 @@
$message_body = get_input_value('_message', RCUBE_INPUT_POST, TRUE, $message_charset);
if ($isHtml) {
- $font = rcube_fontdefs($RCMAIL->config->get('default_font'));
- $font = $font && is_string($font) ? ' '.$font : NULL;
+ $font_family = rcube_fontdefs($RCMAIL->config->get('default_font', 'Arial'));
$font_size = $RCMAIL->config->get('default_font_size');
- $bstyle = " style='font: ".$font_size.$font.";'";
+ $bstyle = ' style="font:' . $font_size . ' ' . $font_family . ';"';
// append doctype and html/body wrappers
$message_body = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">' .
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index b492c96..53c98ed 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -864,8 +864,8 @@
$blocks['main']['options']['default_font'] = array(
'title' => html::label($field_id, Q(rcube_label('defaultfont'))),
- 'content' => $select_default_font_size->show($RCMAIL->config->get('default_font_size', 1)).
- $select_default_font->show($RCMAIL->config->get('default_font', 1))
+ 'content' => $select_default_font->show($RCMAIL->config->get('default_font', 1)) .
+ $select_default_font_size->show($RCMAIL->config->get('default_font_size', 1))
);
}
break;
--
Gitblit v1.9.1