Skip to content

Commit

Permalink
Remove basic-only preferences
Browse files Browse the repository at this point in the history
  • Loading branch information
@slusarz
slusarz committed Oct 16, 2014
1 parent 09a0a68 commit 78f7ec9
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 113 deletions.
10 changes: 4 additions & 6 deletions imp/config/hooks.php.dist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -579,13 +579,11 @@ class IMP_Hooks
/**
* Allow additional information to be added/edited from the data that is
* passed to the mailbox display template:
* basic: imp/templates/basic/mailbox/mailbox.html
* dynamic: imp/templates/dynamic/msglist_[horiz|vert].html
*
* If you are going to add new columns, you also have to update these
* fields:
* basic: imp/lib/Basic/Mailbox.php to specify the column width.
* dynamic: imp/themes/dynamic/screen.css to specify the column width.
* imp/templates/dynamic/msglist_[horiz|vert].html
*
* If you are going to add new columns, you also have to update the
* fields in imp/themes/dynamic/screen.css to specify the column width.
*
* @param array $msgs The mailbox data.
*
Expand Down
110 changes: 6 additions & 104 deletions imp/config/prefs.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,7 @@
'desc' => _("Create filtering rules to organize your incoming mail, sort it into mailboxes, and delete spam."),
'members' => array(
'filters_link', 'filters_blacklist_link', 'filters_whitelist_link',
'filter_on_login', 'filter_on_display', 'filter_any_mailbox',
'filter_menuitem'
'filter_on_login', 'filter_on_display', 'filter_any_mailbox'
)
);

Expand Down Expand Up @@ -291,13 +290,6 @@
}
);

$_prefs['filter_menuitem'] = array(
'value' => 0,
'type' => 'checkbox',
'desc' => _("Show the filter icon on the menubar?") . ' (<em>' . _("Basic view only") . '</em>)',
'help' => 'filter-menuitem'
);



// *** Event Request Preferences ***
Expand Down Expand Up @@ -483,8 +475,7 @@
'mailto_handler', 'compose_spellcheck', 'set_priority',
'compose_html', 'compose_html_font_family', 'compose_html_font_size',
'compose_cursor', 'signature_show_compose', 'encryptselect',
'delete_attachments_monthly_keep', 'request_mdn', 'reply_lang',
'compose_popup', 'compose_confirm'
'delete_attachments_monthly_keep', 'request_mdn', 'reply_lang'
)
);

Expand Down Expand Up @@ -597,19 +588,6 @@
},
);

$_prefs['compose_popup'] = array(
'value' => 1,
'type' => 'checkbox',
'desc' => _("Compose messages in a separate window?") . ' (<em>' . _("Basic view only") . '</em>)'
);

$_prefs['compose_confirm'] = array(
'value' => 0,
'type' => 'checkbox',
'desc' => _("Display confirmation in popup window after sending a message?") . ' (<em>' . _("Basic view only") . '</em>)',
'requires' => array('compose_popup')
);

// The list of buttons to show in CKeditor
// See http://docs.cksource.com/CKEditor_3.x/Developers_Guide/Toolbar for
// details on configuration
Expand Down Expand Up @@ -1134,15 +1112,14 @@
'desc' => _("Set preferences for what happens when you move and delete messages."),
'members' => array(
'mailbox_return', 'delete_mark_seen', 'use_trash', 'trashselect',
'delhide_trash', 'empty_trash_menu', 'purge_trash_interval',
'purge_trash_keep'
'delhide_trash', 'purge_trash_interval', 'purge_trash_keep'
)
);

$_prefs['mailbox_return'] = array(
'value' => 0,
'type' => 'checkbox',
'desc' => _("Return to the mailbox listing after deleting, moving, or copying a message?") . ' (<em>' . _("Basic view only") . '</em>)'
'desc' => _("Return to the mailbox listing after deleting, moving, or copying a message?") . ' (<em>' . _("Mobile view only") . '</em>)'
);

$_prefs['delete_mark_seen'] = array(
Expand Down Expand Up @@ -1204,17 +1181,6 @@
'desc' => _("Hide deleted messages even if using the Trash mailbox?")
);

$_prefs['empty_trash_menu'] = array(
'value' => 0,
'type' => 'checkbox',
'desc' => _("Display the \"Empty Trash\" link in the menubar?") . ' (<em>' . _("Basic view only") . '</em>)',
'requires' => array('use_trash'),
'requires_nolock' => array('use_trash'),
'suppress' => function() {
return !$GLOBALS['injector']->getInstance('IMP_Factory_Imap')->create()->access(IMP_Imap::ACCESS_TRASH);
}
);

$_prefs['purge_trash_interval'] = array(
'value' => 0,
'type' => 'enum',
Expand Down Expand Up @@ -1255,7 +1221,7 @@
'desc' => _("Configure spam reporting."),
'members' => array(
'spamselect', 'delete_spam_after_report', 'move_innocent_after_report',
'empty_spam_menu', 'purge_spam_interval', 'purge_spam_keep'
'purge_spam_interval', 'purge_spam_keep'
)
);

Expand Down Expand Up @@ -1306,15 +1272,6 @@
}
);

$_prefs['empty_spam_menu'] = array(
'value' => 0,
'type' => 'checkbox',
'desc' => _("Display the \"Empty Spam\" link in the menubar?") . ' (<em>' . _("Basic view only") . '</em>)',
'suppress' => function() {
return !$GLOBALS['injector']->getInstance('IMP_Factory_Imap')->create()->access(IMP_Imap::ACCESS_FOLDERS);
}
);

$_prefs['purge_spam_interval'] = array(
'value' => 0,
'type' => 'enum',
Expand Down Expand Up @@ -1446,9 +1403,7 @@
'desc' => _("Change display preferences for viewing the listing of messages in a mailbox."),
'members' => array(
'initialpageselect', 'mailbox_start', 'sortby', 'sortdir', 'sortdate',
'max_msgs', 'from_link', 'atc_flag', 'preview_enabled',
'preview_maxlen', 'preview_strip_nl', 'preview_show_unread',
'preview_show_tooltip'
'from_link', 'atc_flag'
)
);

Expand Down Expand Up @@ -1529,12 +1484,6 @@
'desc' => _("Criteria to use when sorting by date:")
);

$_prefs['max_msgs'] = array(
'value' => 30,
'type' => 'number',
'desc' => _("Messages per page in the mailbox view.") . ' (<em>' . _("Basic view only") . '</em>)'
);

$_prefs['from_link'] = array(
'value' => 1,
'type' => 'enum',
Expand All @@ -1555,53 +1504,6 @@
'desc' => _("Indicate whether attachments exist in a message in the mailbox listing?")
);

$_prefs['preview_enabled'] = array(
// Disabled and locked by default: previews can be performance intensive,
// especially without caching.
'value' => 0,
'locked' => true,
'type' => 'checkbox',
'desc' => _("Enable message previews?") . ' (<em>' . _("Basic view only") . '</em>)'
);

$_prefs['preview_maxlen'] = array(
'value' => 250,
'advanced' => true,
'type' => 'enum',
'enum' => array(
100 => _("100 characters"),
250 => _("250 characters"),
500 => _("500 characters"),
1000 => _("1000 characters")
),
'desc' => _("Characters to display in preview:"),
'requires' => array('preview_enabled')
);

$_prefs['preview_strip_nl'] = array(
'value' => 1,
'advanced' => true,
'type' => 'checkbox',
'desc' => _("Strip linebreaks in preview?"),
'requires' => array('preview_enabled')
);

$_prefs['preview_show_unread'] = array(
'value' => 1,
'advanced' => true,
'type' => 'checkbox',
'desc' => _("Show previews for unread messages only?"),
'requires' => array('preview_enabled')
);

$_prefs['preview_show_tooltip'] = array(
'value' => 0,
'advanced' => true,
'type' => 'checkbox',
'desc' => _("Show previews in tooltips?"),
'requires' => array('preview_enabled')
);



// *** Folder Display Preferences ***
Expand Down
4 changes: 2 additions & 2 deletions imp/docs/RELEASE_NOTES
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ Mail Program (IMP) version H5 (6.2.0).

IMP, the Internet Mail Program, is one of the most popular and widely deployed
open source webmail applications in the world. It allows universal, web-based
access to IMAP and POP3 mail servers and provides dynamic, mobile, basic, and
minimal interfaces with a rich range of features normally found only in desktop
access to IMAP and POP3 mail servers and provides full-featured and mobile
interfaces with a rich range of features normally found only in desktop
email clients. For more information on IMP, visit
http://www.horde.org/apps/imp.

Expand Down
20 changes: 19 additions & 1 deletion imp/docs/UPGRADING
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ outdated.
Upgrading IMP From 6.2.x To 7.x
===============================

The minimal view has been removed.
The basic and minimal views have been removed.


Configuration Options (conf.php)
Expand All @@ -64,6 +64,24 @@ The following hooks have been added::
dynamic_prefs


Preferences (prefs.php)
-----------------------

The following preferences have been removed::

compose_confirm
compose_popup
empty_spam_menu
empty_trash_menu
filter_menuitem
max_msgs
preview_enabled
preview_maxlen
preview_show_tooltip
preview_show_unread
preview_strip_nl



Upgrading IMP From 6.1.x To 6.2
===============================
Expand Down

0 comments on commit 78f7ec9

Please sign in to comment.