Imported Upstream version 0.5

[roundcube.git] / program / steps / settings / edit_prefs.inc

diff --git a/program/steps/settings/edit_prefs.inc b/program/steps/settings/edit_prefs.inc
index 06ae250b35674016d3c67863c0c96330c2817ec0..8679c94d0bd96ec77e3027dcf5784d0c8eca1f07 100644 (file)
--- a/program/steps/settings/edit_prefs.inc
+++ b/program/steps/settings/edit_prefs.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/settings/edit_prefs.inc                                 |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2007, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -34,28 +34,31 @@ function rcmail_user_prefs_form($attrib)
   $RCMAIL->output->add_label('nopagesizewarning');
 
   unset($attrib['form']);
-  
+
   list($form_start, $form_end) = get_form_tags($attrib, 'save-prefs', null,
     array('name' => '_section', 'value' => $CURR_SECTION));
 
   $out = $form_start;
 
   foreach ($SECTIONS[$CURR_SECTION]['blocks'] as $idx => $block) {
-    if ($block['options']) {
+    if (!empty($block['options'])) {
       $table = new html_table(array('cols' => 2));
 
       foreach ($block['options'] as $option) {
         if ($option['advanced'])
-         $table->set_row_attribs('advanced');
-    
+             $table->set_row_attribs('advanced');
+
         $table->add('title', $option['title']);
-       $table->add(null, $option['content']);
-        }
-    
-      $out .= html::tag('fieldset', null, html::tag('legend', null, $block['name']) . $table->show($attrib));
+           $table->add(null, $option['content']);
       }
+
+      $out .= html::tag('fieldset', null, 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']);
     }
-                                                                     
+  }
+
   return $out . $form_end;
 }
 
@@ -75,4 +78,4 @@ $OUTPUT->add_handlers(array(
 
 $OUTPUT->send('settingsedit');
 
-?>
+