mirror of
https://github.com/the-djmaze/snappymail.git
synced 2024-12-31 03:52:01 +08:00
improve: add 'collapse_blockquotes', 'allow_spellcheck' and 'mail_list_grouped' to admin settings ('defaults' section)
This commit is contained in:
parent
22691450af
commit
35cd354353
2 changed files with 8 additions and 4 deletions
|
@ -679,16 +679,17 @@ class Actions
|
|||
|
||||
'contactsAllowed' => $this->AddressBookProvider($oAccount)->IsActive(),
|
||||
|
||||
'allowSpellcheck' => $oConfig->Get('defaults', 'allow_spellcheck', false),
|
||||
'ViewHTML' => (bool) $oConfig->Get('defaults', 'view_html', true),
|
||||
'ViewImages' => $oConfig->Get('defaults', 'view_images', 'ask'),
|
||||
'ViewImagesWhitelist' => '',
|
||||
'RemoveColors' => (bool) $oConfig->Get('defaults', 'remove_colors', false),
|
||||
'AllowStyles' => false,
|
||||
'ListInlineAttachments' => false,
|
||||
'CollapseBlockquotes' => true,
|
||||
'CollapseBlockquotes' => $oConfig->Get('defaults', 'collapse_blockquotes', true),
|
||||
'MaxBlockquotesLevel' => 0,
|
||||
'simpleAttachmentsList' => false,
|
||||
'listGrouped' => false,
|
||||
'listGrouped' => $oConfig->Get('defaults', 'mail_list_grouped', false),
|
||||
'MessagesPerPage' => (int) $oConfig->Get('webmail', 'messages_per_page', 25),
|
||||
'MessageReadDelay' => (int) $oConfig->Get('webmail', 'message_read_delay', 5),
|
||||
'MsgDefaultAction' => (int) $oConfig->Get('defaults', 'msg_default_action', 1),
|
||||
|
@ -773,7 +774,7 @@ class Actions
|
|||
$aResult['requireTLS'] = (bool) $oSettings->GetConf('requireTLS', false);
|
||||
$aResult['pgpSign'] = (bool) $oSettings->GetConf('pgpSign', false);
|
||||
$aResult['pgpEncrypt'] = (bool) $oSettings->GetConf('pgpEncrypt', false);
|
||||
$aResult['allowSpellcheck'] = (bool) $oSettings->GetConf('allowSpellcheck', false);
|
||||
$aResult['allowSpellcheck'] = (bool) $oSettings->GetConf('allowSpellcheck', $aResult['allowSpellcheck']);
|
||||
// $aResult['allowCtrlEnterOnCompose'] = (bool) $oSettings->GetConf('allowCtrlEnterOnCompose', true);
|
||||
|
||||
$aResult['ViewHTML'] = (bool)$oSettings->GetConf('ViewHTML', $aResult['ViewHTML']);
|
||||
|
|
|
@ -301,10 +301,13 @@ Values:
|
|||
"match" - whitelist or ask
|
||||
"always" - show always'),
|
||||
'contacts_autosave' => array(true),
|
||||
'mail_use_threads' => array(false),
|
||||
'mail_list_grouped' => array(false),
|
||||
'mail_use_threads' => array(false),
|
||||
'allow_draft_autosave' => array(true),
|
||||
'mail_reply_same_folder' => array(false),
|
||||
'msg_default_action' => array(1, '1 - reply, 2 - reply all'),
|
||||
'collapse_blockquotes' => array(true),
|
||||
'allow_spellcheck' => array(false)
|
||||
),
|
||||
|
||||
'logs' => array(
|
||||
|
|
Loading…
Reference in a new issue