From 888f9118354054c24bb22546618f311765f9554b Mon Sep 17 00:00:00 2001
From: Dennis1993 <marvin-wegener@outlook.com>
Date: Mon, 2 Sep 2013 12:55:28 +0200
Subject: Update func.inc

---
 program/steps/settings/func.inc | 45 +++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

(limited to 'program/steps/settings/func.inc')

diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index fdc07be9e..8feeda17f 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -838,28 +838,29 @@ function rcmail_user_prefs($current = null)
             }
 
             if (!isset($no_override['default_font'])) {
-                if (!$current) {
-                    continue 2;
-                }
-
-                $field_id = 'rcmfd_default_font';
-                $fonts    = rcube_fontdefs();
-                $selected = $config['default_font'];
-
-                $select = '<select name="_default_font" id="'.$field_id.'">';
-                $select .= '<option value=""' . (!$selected ? ' selected="selected"' : '') . '>---</option>';
-                foreach ($fonts as $fname => $font) {
-                    $select .= '<option value="'.$fname.'"'
-                        . ($fname == $selected ? ' selected="selected"' : '')
-                        . ' style=\'font-family: ' . $font . '\'>'
-                        . Q($fname) . '</option>';
-                }
-                $select .= '</select>';
-
-                $blocks['main']['options']['default_font'] = array(
-                    'title' => html::label($field_id, Q(rcube_label('defaultfont'))),
-                    'content' => $select
-                );
+              // Default font size
+              $field_id = 'rcmfd_default_font_size';
+              $select_default_font_size = new html_select(array('name' => '_default_font_size', 'id' => $field_id));
+
+              $fontsizes = array('8pt', '10pt', '12pt', '14pt', '18pt', '24pt', '36pt');
+              foreach ($fontsizes as $size) {
+                $select_default_font_size->add($size, $size);
+              }
+
+              // Default font
+              $field_id = 'rcmfd_default_font';
+              $select_default_font = new html_select(array('name' => '_default_font', 'id' => $field_id));
+
+              $fonts = rcube_fontdefs();
+              foreach ($fonts as $fname => $font) {
+                $select_default_font->add($fname, $fname);
+              }
+
+              $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))
+              );
             }
         break;
 
-- 
cgit v1.2.3


From d8d5692cff411dc769d8fc1c7dd5ea8acbb15837 Mon Sep 17 00:00:00 2001
From: Dennis1993 <marvin-wegener@outlook.com>
Date: Mon, 2 Sep 2013 12:57:15 +0200
Subject: Update func.inc

---
 program/steps/settings/func.inc | 46 ++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'program/steps/settings/func.inc')

diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 8feeda17f..64fc8b05c 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -838,29 +838,29 @@ function rcmail_user_prefs($current = null)
             }
 
             if (!isset($no_override['default_font'])) {
-              // Default font size
-              $field_id = 'rcmfd_default_font_size';
-              $select_default_font_size = new html_select(array('name' => '_default_font_size', 'id' => $field_id));
-
-              $fontsizes = array('8pt', '10pt', '12pt', '14pt', '18pt', '24pt', '36pt');
-              foreach ($fontsizes as $size) {
-                $select_default_font_size->add($size, $size);
-              }
-
-              // Default font
-              $field_id = 'rcmfd_default_font';
-              $select_default_font = new html_select(array('name' => '_default_font', 'id' => $field_id));
-
-              $fonts = rcube_fontdefs();
-              foreach ($fonts as $fname => $font) {
-                $select_default_font->add($fname, $fname);
-              }
-
-              $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))
-              );
+                // Default font size
+                $field_id = 'rcmfd_default_font_size';
+                $select_default_font_size = new html_select(array('name' => '_default_font_size', 'id' => $field_id));
+
+                $fontsizes = array('8pt', '10pt', '12pt', '14pt', '18pt', '24pt', '36pt');
+                foreach ($fontsizes as $size) {
+                    $select_default_font_size->add($size, $size);
+                }
+
+                // Default font
+                $field_id = 'rcmfd_default_font';
+                $select_default_font = new html_select(array('name' => '_default_font', 'id' => $field_id));
+
+                $fonts = rcube_fontdefs();
+                foreach ($fonts as $fname => $font) {
+                    $select_default_font->add($fname, $fname);
+                }
+
+                $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))
+                );
             }
         break;
 
-- 
cgit v1.2.3


From 153e455f6566cb7a4349b7f2197e842d6ec9bf90 Mon Sep 17 00:00:00 2001
From: Dennis1993 <marvin-wegener@outlook.com>
Date: Mon, 2 Sep 2013 13:16:04 +0200
Subject: Update func.inc

---
 program/steps/settings/func.inc | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'program/steps/settings/func.inc')

diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 64fc8b05c..57c52a01e 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -838,6 +838,10 @@ function rcmail_user_prefs($current = null)
             }
 
             if (!isset($no_override['default_font'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
                 // Default font size
                 $field_id = 'rcmfd_default_font_size';
                 $select_default_font_size = new html_select(array('name' => '_default_font_size', 'id' => $field_id));
-- 
cgit v1.2.3