diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-12-04 10:21:34 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-12-04 10:21:34 +0000 |
| commit | 300c892f4fe7f713a12c9f642128d68e52ad339f (patch) | |
| tree | 2ef8670b753fafbfbb3ef929bc721e728e951144 /roundcubemail/program/steps/settings/func.inc | |
| parent | 460d6638fa3b8b9d9d9e7237cfd6dad8bc54b64a (diff) | |
- Added 'show_images' option, removed 'addrbook_show_images' (#1485597)
git-svn-id: https://svn.roundcube.net/trunk@2115 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps/settings/func.inc')
| -rw-r--r-- | roundcubemail/program/steps/settings/func.inc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/roundcubemail/program/steps/settings/func.inc b/roundcubemail/program/steps/settings/func.inc index 6a158b9e9..e25a1879f 100644 --- a/roundcubemail/program/steps/settings/func.inc +++ b/roundcubemail/program/steps/settings/func.inc @@ -210,14 +210,15 @@ function rcmail_user_prefs_form($attrib) $table->add(null, $input_preferhtml->show($config['prefer_html']?1:0)); } - // show checkbox for displaying images from people in the addressbook - if (!isset($no_override['addrbook_show_images'])) { - $field_id = 'rcmfd_addrbook_show_images'; - $input_addrbook_show_images = new html_checkbox(array('name' => '_addrbook_show_images', 'id' => $field_id, - 'value' => 1, 'disabled' => $config['prefer_html']?0:1)); + if (!isset($no_override['show_images'])) { + $field_id = 'rcmfd_show_images'; + $input_show_images = new html_select(array('name' => '_show_images', 'id' => $field_id)); + $input_show_images->add(rcube_label('never'), 0); + $input_show_images->add(rcube_label('fromknownsenders'), 1); + $input_show_images->add(rcube_label('always'), 2); - $table->add('title', html::label($field_id, Q(rcube_label('showknownimages')))); - $table->add(null, $input_addrbook_show_images->show($config['addrbook_show_images']?1:0)); + $table->add('title', html::label($field_id, Q(rcube_label('showremoteimages')))); + $table->add(null, $input_show_images->show($config['show_images'])); } if (!isset($no_override['inline_images'])) { |