Merge branch 'master' of github.com:roundcube/roundcubemail

3 files changed, 31 insertions, 23 deletions

diff --git a/program/steps/settings/edit_prefs.inc b/program/steps/settings/edit_prefs.inc
index 468e4994d..adf6b1623 100644
--- a/program/steps/settings/edit_prefs.inc
+++ b/program/steps/settings/edit_prefs.inc
@@ -40,24 +40,21 @@ function rcmail_user_prefs_form($attrib)
 
   $out = $form_start;
 
-  foreach ($SECTIONS[$CURR_SECTION]['blocks'] as $block) {
+  foreach ($SECTIONS[$CURR_SECTION]['blocks'] as $class => $block) {
     if (!empty($block['options'])) {
       $table = new html_table(array('cols' => 2));
 
       foreach ($block['options'] as $option) {
-        if ($option['advanced'])
-	      $table->set_row_attribs('advanced');
-
         if (isset($option['title'])) {
           $table->add('title', $option['title']);
-  	      $table->add(null, $option['content']);
+          $table->add(null, $option['content']);
         }
         else {
           $table->add(array('colspan' => 2), $option['content']);
         }
       }
 
-      $out .= html::tag('fieldset', null, html::tag('legend', null, $block['name']) . $table->show($attrib));
+      $out .= html::tag('fieldset', $class, html::tag('legend', null, $block['name']) . $table->show($attrib));
     }
     else if (!empty($block['content'])) {
       $out .= html::tag('fieldset', null, html::tag('legend', null, $block['name']) . $block['content']);
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index fdc07be9e..53c98eddf 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -158,6 +158,7 @@ function rcmail_user_prefs($current = null)
                 'main'    => array('name' => Q(rcube_label('mainoptions'))),
                 'skin'    => array('name' => Q(rcube_label('skin'))),
                 'browser' => array('name' => Q(rcube_label('browseroptions'))),
+                'advanced'=> array('name' => Q(rcube_label('advancedoptions'))),
             );
 
             // language selection
@@ -367,6 +368,7 @@ function rcmail_user_prefs($current = null)
             $blocks = array(
                 'main'        => array('name' => Q(rcube_label('mainoptions'))),
                 'new_message' => array('name' => Q(rcube_label('newmessage'))),
+                'advanced'    => array('name' => Q(rcube_label('advancedoptions'))),
             );
 
             // show config parameter for preview pane
@@ -488,6 +490,7 @@ function rcmail_user_prefs($current = null)
         case 'mailview':
             $blocks = array(
                 'main' => array('name' => Q(rcube_label('mainoptions'))),
+                'advanced'   => array('name' => Q(rcube_label('advancedoptions'))),
             );
 
             // show checkbox to open message view in new window
@@ -543,7 +546,7 @@ function rcmail_user_prefs($current = null)
 
                 $field_id = 'rcmfd_default_charset';
 
-                $blocks['main']['options']['default_charset'] = array(
+                $blocks['advanced']['options']['default_charset'] = array(
                     'title' => html::label($field_id, Q(rcube_label('defaultcharset'))),
                     'content' => $RCMAIL->output->charset_selector(array(
                         'id' => $field_id, 'name' => '_default_charset', 'selected' => $config['default_charset']
@@ -605,6 +608,7 @@ function rcmail_user_prefs($current = null)
                 'main'       => array('name' => Q(rcube_label('mainoptions'))),
                 'sig'        => array('name' => Q(rcube_label('signatureoptions'))),
                 'spellcheck' => array('name' => Q(rcube_label('spellcheckoptions'))),
+                'advanced'   => array('name' => Q(rcube_label('advancedoptions'))),
             );
 
             // show checkbox to compose messages in a new window
@@ -673,8 +677,7 @@ function rcmail_user_prefs($current = null)
                 $select->add(rcube_label('miscfolding'), 1);
                 $select->add(rcube_label('2047folding'), 2);
 
-                $blocks['main']['options']['mime_param_folding'] = array(
-                    'advanced' => true,
+                $blocks['advanced']['options']['mime_param_folding'] = array(
                     'title'    => html::label($field_id, Q(rcube_label('mimeparamfolding'))),
                     'content'  => $select->show($config['mime_param_folding']),
                 );
@@ -688,8 +691,7 @@ function rcmail_user_prefs($current = null)
                 $field_id = 'rcmfd_force_7bit';
                 $input    = new html_checkbox(array('name' => '_force_7bit', 'id' => $field_id, 'value' => 1));
 
-                $blocks['main']['options']['force_7bit'] = array(
-                    'advanced' => true,
+                $blocks['advanced']['options']['force_7bit'] = array(
                     'title'    => html::label($field_id, Q(rcube_label('force7bit'))),
                     'content'  => $input->show($config['force_7bit']?1:0),
                 );
@@ -842,23 +844,28 @@ function rcmail_user_prefs($current = null)
                     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));
+
+                $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';
-                $fonts    = rcube_fontdefs();
-                $selected = $config['default_font'];
+                $select_default_font = new html_select(array('name' => '_default_font', 'id' => $field_id));
 
-                $select = '<select name="_default_font" id="'.$field_id.'">';
-                $select .= '<option value=""' . (!$selected ? ' selected="selected"' : '') . '>---</option>';
+                $fonts = rcube_fontdefs();
                 foreach ($fonts as $fname => $font) {
-                    $select .= '<option value="'.$fname.'"'
-                        . ($fname == $selected ? ' selected="selected"' : '')
-                        . ' style=\'font-family: ' . $font . '\'>'
-                        . Q($fname) . '</option>';
+                    $select_default_font->add($fname, $fname);
                 }
-                $select .= '</select>';
 
                 $blocks['main']['options']['default_font'] = array(
                     'title' => html::label($field_id, Q(rcube_label('defaultfont'))),
-                    'content' => $select
+                    'content' => $select_default_font->show($RCMAIL->config->get('default_font', 1)) .
+                        $select_default_font_size->show($RCMAIL->config->get('default_font_size', 1))
                 );
             }
         break;
@@ -866,7 +873,8 @@ function rcmail_user_prefs($current = null)
         // Addressbook config
         case 'addressbook':
             $blocks = array(
-                'main' => array('name' => Q(rcube_label('mainoptions'))),
+                'main'     => array('name' => Q(rcube_label('mainoptions'))),
+                'advanced' => array('name' => Q(rcube_label('advancedoptions'))),
             );
 
             if (!isset($no_override['default_addressbook'])
@@ -962,7 +970,8 @@ function rcmail_user_prefs($current = null)
         // Special IMAP folders
         case 'folders':
             $blocks = array(
-                'main' => array('name' => Q(rcube_label('mainoptions'))),
+                'main'     => array('name' => Q(rcube_label('mainoptions'))),
+                'advanced' => array('name' => Q(rcube_label('advancedoptions'))),
             );
 
             if (!isset($no_override['show_real_foldernames'])) {
@@ -1043,6 +1052,7 @@ function rcmail_user_prefs($current = null)
             $blocks = array(
                 'main'        => array('name' => Q(rcube_label('mainoptions'))),
                 'maintenance' => array('name' => Q(rcube_label('maintenance'))),
+                'advanced'    => array('name' => Q(rcube_label('advancedoptions'))),
             );
 
             if (!isset($no_override['read_when_deleted'])) {
diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc
index 3e8b1d17e..717c7ad8c 100644
--- a/program/steps/settings/save_prefs.inc
+++ b/program/steps/settings/save_prefs.inc
@@ -89,6 +89,7 @@ switch ($CURR_SECTION)
       'reply_mode'         => isset($_POST['_reply_mode']) ? intval($_POST['_reply_mode']) : 0,
       'strip_existing_sig' => isset($_POST['_strip_existing_sig']),
       'default_font'       => get_input_value('_default_font', RCUBE_INPUT_POST),
+      'default_font_size'  => get_input_value('_default_font_size', RCUBE_INPUT_POST),
       'forward_attachment' => !empty($_POST['_forward_attachment']),
     );