Changeset f8e8af7 in github

Timestamp:

Sep 15, 2010 5:27:45 AM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

acbf0f5

Parents:

f12d218

Message:

• Settings block (fieldset) can have any content (not only a table with hardcoded structure)

Location:

program/steps/settings

Files:

• edit_prefs.inc (modified) (2 diffs)
• func.inc (modified) (16 diffs)

program/steps/settings/edit_prefs.inc

@@ -35 +35 @@
 
   unset($attrib['form']);
-  
+
   list($form_start, $form_end) = get_form_tags($attrib, 'save-prefs', null,
     array('name' => '_section', 'value' => $CURR_SECTION));
@@ -42 +42 @@
 
   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']);
-        }
-    
+            $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;

program/steps/settings/func.inc

@@ -36 +36 @@
   $OUTPUT->set_env('contentframe', $attrib['name']);
   $OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/blank.gif');
-  
+
   return html::iframe($attrib);
 }
@@ -44 +44 @@
 {
   global $RCMAIL;
-  
+
   // add id to message list table if not specified
   if (!strlen($attrib['id']))
@@ -50 +50 @@
 
   list($list, $cols) = rcmail_user_prefs();
-            
+
   // create XHTML table
   $out = rcube_table_output($attrib, $list, $cols, 'id');
@@ -97 +97 @@
 
   $form_start = $form_end = '';
-  
+
   if (empty($EDIT_FORM)) {
     $request_key = $action . (isset($id) ? '.'.$id : '');
@@ -108 +108 @@
           'noclose' => true
         ) + $attrib);
-    
+
     if (is_array($hidden)) {
       $hiddenfields = new html_hiddenfield($hidden);
       $form_start .= $hiddenfields->show();
     }
-    
+
     $form_end = !strlen($attrib['form']) ? '</form>' : '';
 
@@ -140 +140 @@
 
   $sections = $plugin['list'];
-        
+
   $config = $RCMAIL->config->all();
   $no_override = array_flip($RCMAIL->config->get('dont_override', array()));
-  
+
   foreach ($sections as $idx => $sect) {
-  
+
     if ($current && $sect['id'] != $current)
       continue;
-  
+
     $blocks = array();
-    
+
     switch ($sect['id']) {
     // general
     case 'general':
-    
+
     $blocks = array(
       'main' => array('name' => Q(rcube_label('mainoptions'))),
       'list' => array('name' => Q(rcube_label('listoptions'))),
     );
-    
+
     // language selection
     if (!isset($no_override['language'])) {
@@ -276 +276 @@
       }
     }
-    
-    break;    
-    
+
+    break;
+
     // Mailbox view (mail screen)
     case 'mailbox':
-    
+
     $blocks = array(
       'main' => array('name' => Q(rcube_label('mainoptions'))),
@@ -303 +303 @@
       // apply default if config option is not set at all
       $config['preview_pane_mark_read'] = $RCMAIL->config->get('preview_pane_mark_read', 0);
-      
+
       $field_id = 'rcmfd_preview_pane_mark_read';
       $select_delay = new html_select(array('name' => '_preview_pane_mark_read', 'id' => $field_id,
@@ -343 +343 @@
       $select_autoexpand_threads->add(rcube_label('do_expand'), 1);
       $select_autoexpand_threads->add(rcube_label('expand_only_unread'), 2);
-      
+
       $blocks['main']['options']['autoexpand_threads'] = array(
         'title' => html::label($field_id, Q(rcube_label('autoexpand_threads'))),
@@ -387 +387 @@
 
     break;
-    
+
     // Message viewing
     case 'mailview':
-    
+
     $blocks = array(
       'main' => array('name' => Q(rcube_label('mainoptions'))),
@@ -453 +453 @@
 
     break;
-    
+
     // Mail composition
     case 'compose':
-    
+
     $blocks = array(
       'main' => array('name' => Q(rcube_label('mainoptions'))),
@@ -559 +559 @@
 
     break;
-    
+
     // Special IMAP folders
     case 'folders':
-    
+
     $blocks = array(
       'main' => array('name' => Q(rcube_label('mainoptions'))),
@@ -606 +606 @@
 
     break;
-    
+
     // Server settings
     case 'server':
-    
+
     $blocks = array(
       'main' => array('name' => Q(rcube_label('mainoptions'))),
@@ -677 +677 @@
       );
     }
-    
+
     break;
     }
@@ -683 +683 @@
     $data = $RCMAIL->plugins->exec_hook('preferences_list', array('section' => $sect['id'], 'blocks' => $blocks));
     $found = false;
-    
+
     // create output
     foreach ($data['blocks'] as $block) {
-      if ($block['options']) {
-        foreach ($block['options'] as $option) {
-          $found = true;
-          break 2;
-        }
+      if (!empty($block['content']) || !empty($block['options'])) {
+        $found = true;
+            break;
       }
     }
@@ -710 +708 @@
 
   $dir = opendir($path);
-  
+
   if (!$dir)
         return false;
-  
+
   while (($file = readdir($dir)) !== false)
   {