diff --git a/dev/App/User.js b/dev/App/User.js index 72af43028..6cfd2f4a6 100644 --- a/dev/App/User.js +++ b/dev/App/User.js @@ -933,8 +933,7 @@ class AppUser extends AbstractApp { // When auto-login is active if ( !!SettingsGet('AccountSignMe') && - navigator.registerProtocolHandler && - Settings.capa(Capa.Composer) + navigator.registerProtocolHandler ) { setTimeout(() => { try { @@ -982,7 +981,7 @@ class AppUser extends AbstractApp { showMessageComposer(params = []) { - Settings.capa(Capa.Composer) && showScreenPopup(ComposePopupView, params); + showScreenPopup(ComposePopupView, params); } } diff --git a/dev/Common/Enums.js b/dev/Common/Enums.js index 18dff93c9..e69737d22 100644 --- a/dev/Common/Enums.js +++ b/dev/Common/Enums.js @@ -6,7 +6,6 @@ export const Capa = { OpenPGP: 'OPEN_PGP', Prefetch: 'PREFETCH', - Composer: 'COMPOSER', Contacts: 'CONTACTS', Reload: 'RELOAD', Search: 'SEARCH', diff --git a/dev/View/User/MailBox/FolderList.js b/dev/View/User/MailBox/FolderList.js index f89931e62..ed7394df1 100644 --- a/dev/View/User/MailBox/FolderList.js +++ b/dev/View/User/MailBox/FolderList.js @@ -1,7 +1,7 @@ import ko from 'ko'; -import { Capa, Scope } from 'Common/Enums'; -import { leftPanelDisabled, moveAction, Settings } from 'Common/Globals'; +import { Scope } from 'Common/Enums'; +import { leftPanelDisabled, moveAction } from 'Common/Globals'; import { mailBox, settings } from 'Common/Links'; import { setFolderHash } from 'Common/Cache'; @@ -36,7 +36,6 @@ export class FolderListMailBoxUserView extends AbstractViewLeft { this.leftPanelDisabled = leftPanelDisabled; - this.allowComposer = Settings.capa(Capa.Composer); this.allowContacts = AppUserStore.allowContacts(); this.folderListFocused = ko.computed(() => Scope.FolderList === AppUserStore.focusedState()); diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js index 8d5ea68f1..67bdde223 100644 --- a/dev/View/User/MailBox/MessageList.js +++ b/dev/View/User/MailBox/MessageList.js @@ -62,7 +62,6 @@ export class MessageListMailBoxUserView extends AbstractViewRight { this.allowReload = Settings.capa(Capa.Reload); this.allowSearch = Settings.capa(Capa.Search); this.allowSearchAdv = Settings.capa(Capa.SearchAdv); - this.allowComposer = Settings.capa(Capa.Composer); this.allowMessageListActions = Settings.capa(Capa.MessageListActions); this.allowDangerousActions = Settings.capa(Capa.DangerousActions); diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js index 753390cff..cce7a67d0 100644 --- a/dev/View/User/MailBox/MessageView.js +++ b/dev/View/User/MailBox/MessageView.js @@ -73,7 +73,6 @@ class MessageViewMailBoxUserView extends AbstractViewRight { this.moveAction = moveAction; - this.allowComposer = Settings.capa(Capa.Composer); this.allowMessageActions = Settings.capa(Capa.MessageActions); this.allowMessageListActions = Settings.capa(Capa.MessageListActions); diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php index 91c3ea399..00b0182d2 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -1961,12 +1961,8 @@ class Actions $aResult[] = Enumerations\Capa::MESSAGE_ACTIONS; } - if ($oConfig->Get('capa', 'composer', true)) { - $aResult[] = Enumerations\Capa::COMPOSER; - - if ($oConfig->Get('capa', 'contacts', true)) { - $aResult[] = Enumerations\Capa::CONTACTS; - } + if ($oConfig->Get('capa', 'contacts', true)) { + $aResult[] = Enumerations\Capa::CONTACTS; } if ($oConfig->Get('capa', 'search', true)) { diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php index bd99f3cc2..5e59bcab3 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php @@ -104,11 +104,6 @@ trait Messages { $oAccount = $this->initMailClientConnection(); - if (!$this->GetCapa(false, Capa::COMPOSER, $oAccount)) - { - return $this->FalseResponse(__FUNCTION__); - } - $sMessageFolder = $this->GetActionParam('MessageFolder', ''); $iMessageUid = $this->GetActionParam('MessageUid', 0); @@ -171,11 +166,6 @@ trait Messages { $oAccount = $this->initMailClientConnection(); - if (!$this->GetCapa(false, Capa::COMPOSER, $oAccount)) - { - return $this->FalseResponse(__FUNCTION__); - } - $oConfig = $this->Config(); $sDraftFolder = $this->GetActionParam('MessageFolder', ''); @@ -354,11 +344,6 @@ trait Messages { $oAccount = $this->initMailClientConnection(); - if (!$this->GetCapa(false, Capa::COMPOSER, $oAccount)) - { - return $this->FalseResponse(__FUNCTION__); - } - $oMessage = $this->buildReadReceiptMessage($oAccount); $this->Plugins()->RunHook('filter.send-read-receipt-message', array($oMessage, $oAccount)); diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php index 346624e58..bf63aca99 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php @@ -250,11 +250,6 @@ trait Response $mResult['IsForwarded'] = \strlen($sForwardedFlag) && \in_array(\strtolower($sForwardedFlag), $aFlags); $mResult['IsReadReceipt'] = \strlen($sReadReceiptFlag) && \in_array(\strtolower($sReadReceiptFlag), $aFlags); - if (!$this->GetCapa(false, Capa::COMPOSER, $oAccount)) - { - $mResult['IsReadReceipt'] = true; - } - if ('Message' === $sParent) { $oAttachments = /* @var \MailSo\Mail\AttachmentCollection */ $mResponse->Attachments(); diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php index 4ec63078d..b6bb5e5be 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php @@ -186,7 +186,6 @@ class Application extends \RainLoop\Config\AbstractConfig ), 'capa' => array( - 'composer' => array(true), 'contacts' => array(true), 'settings' => array(true), 'quota' => array(true), diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php index bbb93b4ef..0dab192ab 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php @@ -12,7 +12,6 @@ class Capa const ATTACHMENT_THUMBNAILS = 'ATTACHMENT_THUMBNAILS'; const ADDITIONAL_ACCOUNTS = 'ADDITIONAL_ACCOUNTS'; const IDENTITIES = 'IDENTITIES'; - const COMPOSER = 'COMPOSER'; const CONTACTS = 'CONTACTS'; const RELOAD = 'RELOAD'; const SEARCH = 'SEARCH'; diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html index 423bfa0bb..33ccfb10e 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html @@ -1,6 +1,6 @@
- + diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html index f77b54e00..f3fe7897c 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html @@ -4,7 +4,7 @@
❮ ❯ - + @@ -45,7 +45,7 @@ 🗑
-
+
☰