Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve: add 'collapse_blockquotes', 'allow_spellcheck' and 'mail_list_grouped' to admin settings ('defaults' section)

Browse source
This commit is contained in:
Sergey Mosin 2023-08-11 14:44:42 -04:00
parent 22691450af
commit 35cd354353
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -679,16 +679,17 @@ class Actions
'contactsAllowed' => $this->AddressBookProvider($oAccount)->IsActive(), 'contactsAllowed' => $this->AddressBookProvider($oAccount)->IsActive(),
'allowSpellcheck' => $oConfig->Get('defaults', 'allow_spellcheck', false),
'ViewHTML' => (bool) $oConfig->Get('defaults', 'view_html', true), 'ViewHTML' => (bool) $oConfig->Get('defaults', 'view_html', true),
'ViewImages' => $oConfig->Get('defaults', 'view_images', 'ask'), 'ViewImages' => $oConfig->Get('defaults', 'view_images', 'ask'),
'ViewImagesWhitelist' => '', 'ViewImagesWhitelist' => '',
'RemoveColors' => (bool) $oConfig->Get('defaults', 'remove_colors', false), 'RemoveColors' => (bool) $oConfig->Get('defaults', 'remove_colors', false),
'AllowStyles' => false, 'AllowStyles' => false,
'ListInlineAttachments' => false, 'ListInlineAttachments' => false,
'CollapseBlockquotes' => true, 'CollapseBlockquotes' => $oConfig->Get('defaults', 'collapse_blockquotes', true),
'MaxBlockquotesLevel' => 0, 'MaxBlockquotesLevel' => 0,
'simpleAttachmentsList' => false, 'simpleAttachmentsList' => false,
'listGrouped' => false, 'listGrouped' => $oConfig->Get('defaults', 'mail_list_grouped', false),
'MessagesPerPage' => (int) $oConfig->Get('webmail', 'messages_per_page', 25), 'MessagesPerPage' => (int) $oConfig->Get('webmail', 'messages_per_page', 25),
'MessageReadDelay' => (int) $oConfig->Get('webmail', 'message_read_delay', 5), 'MessageReadDelay' => (int) $oConfig->Get('webmail', 'message_read_delay', 5),
'MsgDefaultAction' => (int) $oConfig->Get('defaults', 'msg_default_action', 1), 'MsgDefaultAction' => (int) $oConfig->Get('defaults', 'msg_default_action', 1),
@ -773,7 +774,7 @@ class Actions
$aResult['requireTLS'] = (bool) $oSettings->GetConf('requireTLS', false); $aResult['requireTLS'] = (bool) $oSettings->GetConf('requireTLS', false);
$aResult['pgpSign'] = (bool) $oSettings->GetConf('pgpSign', false); $aResult['pgpSign'] = (bool) $oSettings->GetConf('pgpSign', false);
$aResult['pgpEncrypt'] = (bool) $oSettings->GetConf('pgpEncrypt', 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['allowCtrlEnterOnCompose'] = (bool) $oSettings->GetConf('allowCtrlEnterOnCompose', true);
$aResult['ViewHTML'] = (bool)$oSettings->GetConf('ViewHTML', $aResult['ViewHTML']); $aResult['ViewHTML'] = (bool)$oSettings->GetConf('ViewHTML', $aResult['ViewHTML']);

5
snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
View file

@ -301,10 +301,13 @@ Values:
"match" - whitelist or ask "match" - whitelist or ask
"always" - show always'), "always" - show always'),
'contacts_autosave' => array(true), 'contacts_autosave' => array(true),
'mail_use_threads' => array(false), 'mail_list_grouped' => array(false),
'mail_use_threads' => array(false),
'allow_draft_autosave' => array(true), 'allow_draft_autosave' => array(true),
'mail_reply_same_folder' => array(false), 'mail_reply_same_folder' => array(false),
'msg_default_action' => array(1, '1 - reply, 2 - reply all'), 'msg_default_action' => array(1, '1 - reply, 2 - reply all'),
'collapse_blockquotes' => array(true),
'allow_spellcheck' => array(false)
), ),
'logs' => array( 'logs' => array(