Touch new default font size settings: simplified + codestyle + updated changelog

11 years ago · c1ff572e17
parent 0201298cd8
commit c1ff572e17
3 changed files with 5 additions and 5 deletions
--- a/1
+++ b/1
@ -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)
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@ -473,10 +473,9 @@ $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'));
-  $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">' .
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@ -864,8 +864,8 @@ function rcmail_user_prefs($current = null)

                $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;