Add missing <label>s in Preferences > Special Folders

plugins/archive/archive.php

@@ -402,8 +402,8 @@ class archive extends rcube_plugin
             }
 
             $args['blocks']['main']['options']['archive_mbox'] = array(
-                'title'   => $this->gettext('archivefolder'),
+                'title'   => html::label('_archive_mbox', rcube::Q($this->gettext('archivefolder'))),
-                'content' => $select->show($mbox, array('name' => "_archive_mbox"))
+                'content' => $select->show($mbox, array('id' => '_archive_mbox', 'name' => '_archive_mbox'))
             );
 
             // add option for structuring the archive folder
@@ -415,9 +415,9 @@ class archive extends rcube_plugin
             $archive_type->add($this->gettext('archivetypefolder'), 'folder');
 
             $args['blocks']['archive'] = array(
-                'name' => rcube::Q($this->gettext('settingstitle')),
+                'name'    => rcube::Q($this->gettext('settingstitle')),
                 'options' => array('archive_type' => array(
-                        'title'   => $this->gettext('archivetype'),
+                        'title'   => html::label('ff_archive_type', rcube::Q($this->gettext('archivetype'))),
                         'content' => $archive_type->show($type)
                     )
                 )
@@ -426,7 +426,7 @@ class archive extends rcube_plugin
         else if ($args['section'] == 'server' && !in_array('read_on_archive', $dont_override)) {
             $chbox = new html_checkbox(array('name' => '_read_on_archive', 'id' => 'ff_read_on_archive', 'value' => 1));
             $args['blocks']['main']['options']['read_on_archive'] = array(
-                'title'   => $this->gettext('readonarchive'),
+                'title'   => html::label('ff_read_on_archive', rcube::Q($this->gettext('readonarchive'))),
                 'content' => $chbox->show($rcmail->config->get('read_on_archive') ? 1 : 0)
             );
         }

program/steps/settings/func.inc

@@ -1092,9 +1092,10 @@ function rcmail_user_prefs($current = null)
                     continue 2;
                 }
 
+                $attrs = array('id' => '_drafts_mbox', 'name' => '_drafts_mbox', 'onchange' => $onchange);
                 $blocks['main']['options']['drafts_mbox'] = array(
-                    'title'   => rcube::Q($RCMAIL->gettext('drafts')),
+                    'title'   => html::label($attrs['id'], rcube::Q($RCMAIL->gettext('drafts'))),
-                    'content' => $select->show($config['drafts_mbox'], array('name' => "_drafts_mbox", 'onchange' => $onchange)),
+                    'content' => $select->show($config['drafts_mbox'], $attrs),
                 );
             }
 
@@ -1103,9 +1104,10 @@ function rcmail_user_prefs($current = null)
                     continue 2;
                 }
 
+                $attrs = array('id' => '_sent_mbox', 'name' => '_sent_mbox', 'onchange' => '');
                 $blocks['main']['options']['sent_mbox'] = array(
-                    'title'   => rcube::Q($RCMAIL->gettext('sent')),
+                    'title'   => html::label($attrs['id'], rcube::Q($RCMAIL->gettext('sent'))),
-                    'content' => $select->show($config['sent_mbox'], array('name' => "_sent_mbox", 'onchange' => '')),
+                    'content' => $select->show($config['sent_mbox'], $attrs),
                 );
             }
 
@@ -1114,9 +1116,10 @@ function rcmail_user_prefs($current = null)
                     continue 2;
                 }
 
+                $attrs = array('id' => '_junk_mbox', 'name' => '_junk_mbox', 'onchange' => $onchange);
                 $blocks['main']['options']['junk_mbox'] = array(
-                    'title'   => rcube::Q($RCMAIL->gettext('junk')),
+                    'title'   => html::label($attrs['id'], rcube::Q($RCMAIL->gettext('junk'))),
-                    'content' => $select->show($config['junk_mbox'], array('name' => "_junk_mbox", 'onchange' => $onchange)),
+                    'content' => $select->show($config['junk_mbox'], $attrs),
                 );
             }
 
@@ -1125,9 +1128,10 @@ function rcmail_user_prefs($current = null)
                     continue 2;
                 }
 
+                $attrs = array('id' => '_trash_mbox', 'name' => '_trash_mbox', 'onchange' => $onchange);
                 $blocks['main']['options']['trash_mbox'] = array(
-                    'title'   => rcube::Q($RCMAIL->gettext('trash')),
+                    'title'   => html::label($attrs['id'], rcube::Q($RCMAIL->gettext('trash'))),
-                    'content' => $select->show($config['trash_mbox'], array('name' => "_trash_mbox", 'onchange' => $onchange)),
+                    'content' => $select->show($config['trash_mbox'], $attrs),
                 );
             }
         break;