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

Drop unused NullFolder

Browse source
This commit is contained in:
djmaze 2021-03-29 09:38:18 +02:00
parent ec03999f13
commit 0dbc534305
4 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dev/Model/FolderCollection.js
View file

@ -124,8 +124,7 @@ export class FolderCollectionModel extends AbstractCollectionModel
SettingsGet('DraftFolder') + SettingsGet('DraftFolder') +
SettingsGet('SpamFolder') + SettingsGet('SpamFolder') +
SettingsGet('TrashFolder') + SettingsGet('TrashFolder') +
SettingsGet('ArchiveFolder') + SettingsGet('ArchiveFolder'))
SettingsGet('NullFolder'))
) { ) {
Settings.set('SentFolder', this.SystemFolders[ServerFolderType.SENT] || null); Settings.set('SentFolder', this.SystemFolders[ServerFolderType.SENT] || null);
Settings.set('DraftFolder', this.SystemFolders[ServerFolderType.DRAFTS] || null); Settings.set('DraftFolder', this.SystemFolders[ServerFolderType.DRAFTS] || null);
@ -148,8 +147,7 @@ export class FolderCollectionModel extends AbstractCollectionModel
DraftFolder: FolderUserStore.draftFolder(), DraftFolder: FolderUserStore.draftFolder(),
SpamFolder: FolderUserStore.spamFolder(), SpamFolder: FolderUserStore.spamFolder(),
TrashFolder: FolderUserStore.trashFolder(), TrashFolder: FolderUserStore.trashFolder(),
ArchiveFolder: FolderUserStore.archiveFolder(), ArchiveFolder: FolderUserStore.archiveFolder()
NullFolder: 'NullFolder'
}); });
} }

3
dev/View/Popup/FolderSystem.js
View file

@ -64,8 +64,7 @@ class FolderSystemPopupView extends AbstractViewPopup {
DraftFolder: FolderUserStore.draftFolder(), DraftFolder: FolderUserStore.draftFolder(),
SpamFolder: FolderUserStore.spamFolder(), SpamFolder: FolderUserStore.spamFolder(),
TrashFolder: FolderUserStore.trashFolder(), TrashFolder: FolderUserStore.trashFolder(),
ArchiveFolder: FolderUserStore.archiveFolder(), ArchiveFolder: FolderUserStore.archiveFolder()
NullFolder: 'NullFolder'
}); });
}).debounce(1000), }).debounce(1000),
fCallback = () => { fCallback = () => {

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

@ -1224,7 +1224,6 @@ class Actions
$aResult['SpamFolder'] = (string)$oSettingsLocal->GetConf('SpamFolder', ''); $aResult['SpamFolder'] = (string)$oSettingsLocal->GetConf('SpamFolder', '');
$aResult['TrashFolder'] = (string)$oSettingsLocal->GetConf('TrashFolder', ''); $aResult['TrashFolder'] = (string)$oSettingsLocal->GetConf('TrashFolder', '');
$aResult['ArchiveFolder'] = (string)$oSettingsLocal->GetConf('ArchiveFolder', ''); $aResult['ArchiveFolder'] = (string)$oSettingsLocal->GetConf('ArchiveFolder', '');
$aResult['NullFolder'] = (string)$oSettingsLocal->GetConf('NullFolder', '');
} }
if ($this->GetCapa(false, Enumerations\Capa::SETTINGS, $oAccount)) { if ($this->GetCapa(false, Enumerations\Capa::SETTINGS, $oAccount)) {

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

@ -437,7 +437,6 @@ trait Folders
$oSettingsLocal->SetConf('SpamFolder', $this->GetActionParam('SpamFolder', '')); $oSettingsLocal->SetConf('SpamFolder', $this->GetActionParam('SpamFolder', ''));
$oSettingsLocal->SetConf('TrashFolder', $this->GetActionParam('TrashFolder', '')); $oSettingsLocal->SetConf('TrashFolder', $this->GetActionParam('TrashFolder', ''));
$oSettingsLocal->SetConf('ArchiveFolder', $this->GetActionParam('ArchiveFolder', '')); $oSettingsLocal->SetConf('ArchiveFolder', $this->GetActionParam('ArchiveFolder', ''));
$oSettingsLocal->SetConf('NullFolder', $this->GetActionParam('NullFolder', ''));
return $this->DefaultResponse(__FUNCTION__, return $this->DefaultResponse(__FUNCTION__,
$this->SettingsProvider(true)->Save($oAccount, $oSettingsLocal)); $this->SettingsProvider(true)->Save($oAccount, $oSettingsLocal));