Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-25 18:19:22 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Drop use_imap_list_subscribe and use 'HideUnsubscribed' = false

Browse source 
This prevents user questions regarding: "my folders are missing"
This commit is contained in:
the-djmaze 2022-01-12 11:55:41 +01:00
parent 661e937fd1
commit 5757d8d464
11 changed files with 26 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

5
dev/Remote/User/Fetch.js
View file

@ -216,10 +216,11 @@ class RemoteUserFetch extends AbstractFetchRemote {
} }
/* /*
folderMove(sPrevFolderFullName, sNewFolderFullName) { folderMove(sPrevFolderFullName, sNewFolderFullName, bSubscribe) {
return this.post('FolderMove', FolderUserStore.foldersRenaming, { return this.post('FolderMove', FolderUserStore.foldersRenaming, {
Folder: sPrevFolderFullName, Folder: sPrevFolderFullName,
NewFolder: sNewFolderFullName NewFolder: sNewFolderFullName,
Subscribe: bSubscribe ? 1 : 0
}); });
} }
*/ */

4
dev/Settings/User/Folders.js
View file

@ -62,7 +62,6 @@ export class FoldersUserSettings /*extends AbstractViewSettings*/ {
this.folderForEdit = ko.observable(null).extend({ toggleSubscribeProperty: [this, 'edited'] }); this.folderForEdit = ko.observable(null).extend({ toggleSubscribeProperty: [this, 'edited'] });
this.useImapSubscribe = Settings.app('useImapSubscribe');
SettingsUserStore.hideUnsubscribed.subscribe(value => Remote.saveSetting('HideUnsubscribed', value ? 1 : 0)); SettingsUserStore.hideUnsubscribed.subscribe(value => Remote.saveSetting('HideUnsubscribed', value ? 1 : 0));
} }
@ -72,7 +71,8 @@ export class FoldersUserSettings /*extends AbstractViewSettings*/ {
if (nameToEdit && folder.name() !== nameToEdit) { if (nameToEdit && folder.name() !== nameToEdit) {
Remote.abort('Folders').post('FolderRename', FolderUserStore.foldersRenaming, { Remote.abort('Folders').post('FolderRename', FolderUserStore.foldersRenaming, {
Folder: folder.fullName, Folder: folder.fullName,
NewFolderName: nameToEdit NewFolderName: nameToEdit,
Subscribe: folder.subscribed() ? 1 : 0
}) })
.then(data => { .then(data => {
folder.name(nameToEdit/*data.Name*/); folder.name(nameToEdit/*data.Name*/);

18
dev/Stores/User/Settings.js
View file

@ -3,7 +3,7 @@ import { koComputable } from 'External/ko';
import { Layout, EditorDefaultType } from 'Common/EnumsUser'; import { Layout, EditorDefaultType } from 'Common/EnumsUser';
import { pInt, addObservablesTo } from 'Common/Utils'; import { pInt, addObservablesTo } from 'Common/Utils';
import { $htmlCL, Settings, SettingsGet } from 'Common/Globals'; import { $htmlCL, SettingsGet } from 'Common/Globals';
import { ThemeStore } from 'Stores/Theme'; import { ThemeStore } from 'Stores/Theme';
export const SettingsUserStore = new class { export const SettingsUserStore = new class {
@ -34,7 +34,7 @@ export const SettingsUserStore = new class {
allowDraftAutosave: 1, allowDraftAutosave: 1,
useThreads: 0, useThreads: 0,
replySameFolder: 0, replySameFolder: 0,
hideUnsubscribed: 1, hideUnsubscribed: 0,
autoLogout: 0 autoLogout: 0
}); });
@ -74,13 +74,13 @@ export const SettingsUserStore = new class {
self.messageReadDelay(pInt(SettingsGet('MessageReadDelay'))); self.messageReadDelay(pInt(SettingsGet('MessageReadDelay')));
self.autoLogout(pInt(SettingsGet('AutoLogout'))); self.autoLogout(pInt(SettingsGet('AutoLogout')));
self.showImages(!!SettingsGet('ShowImages')); self.showImages(SettingsGet('ShowImages'));
self.removeColors(!!SettingsGet('RemoveColors')); self.removeColors(SettingsGet('RemoveColors'));
self.useCheckboxesInList(!!SettingsGet('UseCheckboxesInList')); self.useCheckboxesInList(SettingsGet('UseCheckboxesInList'));
self.allowDraftAutosave(!!SettingsGet('AllowDraftAutosave')); self.allowDraftAutosave(SettingsGet('AllowDraftAutosave'));
self.useThreads(!!SettingsGet('UseThreads')); self.useThreads(SettingsGet('UseThreads'));
self.replySameFolder(!!SettingsGet('ReplySameFolder')); self.replySameFolder(SettingsGet('ReplySameFolder'));
self.hideUnsubscribed(Settings.app('useImapSubscribe') && SettingsGet('HideUnsubscribed')); self.hideUnsubscribed(SettingsGet('HideUnsubscribed'));
} }
}; };

5
dev/View/Popup/FolderCreate.js
View file

@ -5,7 +5,6 @@ import { UNUSED_OPTION_VALUE } from 'Common/Consts';
import { defaultOptionsAfterRender } from 'Common/Utils'; import { defaultOptionsAfterRender } from 'Common/Utils';
import { folderListOptionsBuilder, sortFolders } from 'Common/UtilsUser'; import { folderListOptionsBuilder, sortFolders } from 'Common/UtilsUser';
import { getNotification } from 'Common/Translator'; import { getNotification } from 'Common/Translator';
import { Settings } from 'Common/Globals';
import { FolderUserStore } from 'Stores/User/Folder'; import { FolderUserStore } from 'Stores/User/Folder';
import { SettingsUserStore } from 'Stores/User/Settings'; import { SettingsUserStore } from 'Stores/User/Settings';
@ -22,11 +21,9 @@ class FolderCreatePopupView extends AbstractViewPopup {
constructor() { constructor() {
super('FolderCreate'); super('FolderCreate');
this.useImapSubscribe = Settings.app('useImapSubscribe');
this.addObservables({ this.addObservables({
folderName: '', folderName: '',
folderSubscribe: this.useImapSubscribe && SettingsUserStore.hideUnsubscribed, folderSubscribe: SettingsUserStore.hideUnsubscribed(),
selectedParentValue: UNUSED_OPTION_VALUE selectedParentValue: UNUSED_OPTION_VALUE
}); });

6
snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
View file

@ -1224,7 +1224,7 @@ class MailClient
* @throws \MailSo\Base\Exceptions\InvalidArgumentException * @throws \MailSo\Base\Exceptions\InvalidArgumentException
* @throws \MailSo\Mail\Exceptions\RuntimeException * @throws \MailSo\Mail\Exceptions\RuntimeException
*/ */
public function FolderDelete(string $sFolderFullName, bool $bUnsubscribeOnDeletion = true) : self public function FolderDelete(string $sFolderFullName) : self
{ {
if (!\strlen($sFolderFullName) || 'INBOX' === $sFolderFullName) { if (!\strlen($sFolderFullName) || 'INBOX' === $sFolderFullName) {
throw new \MailSo\Base\Exceptions\InvalidArgumentException; throw new \MailSo\Base\Exceptions\InvalidArgumentException;
@ -1239,9 +1239,7 @@ class MailClient
throw new Exceptions\NonEmptyFolder; throw new Exceptions\NonEmptyFolder;
} }
if ($bUnsubscribeOnDeletion) { $this->oImapClient->FolderUnsubscribe($sFolderFullName);
$this->oImapClient->FolderUnsubscribe($sFolderFullName);
}
$this->oImapClient->FolderUnselect(); $this->oImapClient->FolderUnselect();
$this->oImapClient->FolderDelete($sFolderFullName); $this->oImapClient->FolderDelete($sFolderFullName);

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

@ -660,7 +660,6 @@ class Actions
'allowCtrlEnterOnCompose' => (bool)$oConfig->Get('labs', 'allow_ctrl_enter_on_compose', false), 'allowCtrlEnterOnCompose' => (bool)$oConfig->Get('labs', 'allow_ctrl_enter_on_compose', false),
'hideSubmitButton' => (bool)$oConfig->Get('login', 'hide_submit_button', true), 'hideSubmitButton' => (bool)$oConfig->Get('login', 'hide_submit_button', true),
'useImapThread' => (bool)$oConfig->Get('labs', 'use_imap_thread', false), 'useImapThread' => (bool)$oConfig->Get('labs', 'use_imap_thread', false),
'useImapSubscribe' => (bool)$oConfig->Get('labs', 'use_imap_list_subscribe', true),
'allowAppendMessage' => (bool)$oConfig->Get('labs', 'allow_message_append', false), 'allowAppendMessage' => (bool)$oConfig->Get('labs', 'allow_message_append', false),
'folderSpecLimit' => (int)$oConfig->Get('labs', 'folders_spec_limit', 50), 'folderSpecLimit' => (int)$oConfig->Get('labs', 'folders_spec_limit', 50),
'faviconStatus' => (bool)$oConfig->Get('labs', 'favicon_status', true), 'faviconStatus' => (bool)$oConfig->Get('labs', 'favicon_status', true),
@ -738,7 +737,7 @@ class Actions
'AllowDraftAutosave' => (bool) $oConfig->Get('defaults', 'allow_draft_autosave', true), 'AllowDraftAutosave' => (bool) $oConfig->Get('defaults', 'allow_draft_autosave', true),
'ReplySameFolder' => (bool) $oConfig->Get('defaults', 'mail_reply_same_folder', false), 'ReplySameFolder' => (bool) $oConfig->Get('defaults', 'mail_reply_same_folder', false),
'ContactsAutosave' => (bool) $oConfig->Get('defaults', 'contacts_autosave', true), 'ContactsAutosave' => (bool) $oConfig->Get('defaults', 'contacts_autosave', true),
'HideUnsubscribed' => (bool) $oConfig->Get('labs', 'use_imap_list_subscribe', true), 'HideUnsubscribed' => false,
'MainEmail' => '', 'MainEmail' => '',
'InterfaceAnimation' => true, 'InterfaceAnimation' => true,
'UserBackgroundName' => '', 'UserBackgroundName' => '',

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

@ -156,7 +156,7 @@ trait Accounts
$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['HideUnsubscribed'] = (bool) $oSettingsLocal->GetConf('HideUnsubscribed', $oConfig->Get('labs', 'use_imap_list_subscribe', true)); $aResult['HideUnsubscribed'] = (bool) $oSettingsLocal->GetConf('HideUnsubscribed', false);
$aResult['UseThreads'] = (bool) $oSettingsLocal->GetConf('UseThreads', $oConfig->Get('defaults', 'mail_use_threads', false)); $aResult['UseThreads'] = (bool) $oSettingsLocal->GetConf('UseThreads', $oConfig->Get('defaults', 'mail_use_threads', false));
$aResult['ReplySameFolder'] = (bool) $oSettingsLocal->GetConf('ReplySameFolder', $oConfig->Get('defaults', 'mail_reply_same_folder', false)); $aResult['ReplySameFolder'] = (bool) $oSettingsLocal->GetConf('ReplySameFolder', $oConfig->Get('defaults', 'mail_reply_same_folder', false));
} }

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

@ -54,7 +54,7 @@ trait Folders
{ {
$oAccount = $this->initMailClientConnection(); $oAccount = $this->initMailClientConnection();
$HideUnsubscribed = $this->Config()->Get('labs', 'use_imap_list_subscribe', true); $HideUnsubscribed = false;
$oSettingsLocal = $this->SettingsProvider(true)->Load($oAccount); $oSettingsLocal = $this->SettingsProvider(true)->Load($oAccount);
if ($oSettingsLocal instanceof \RainLoop\Settings) { if ($oSettingsLocal instanceof \RainLoop\Settings) {
$HideUnsubscribed = (bool) $oSettingsLocal->GetConf('HideUnsubscribed', $HideUnsubscribed); $HideUnsubscribed = (bool) $oSettingsLocal->GetConf('HideUnsubscribed', $HideUnsubscribed);
@ -68,8 +68,6 @@ trait Folders
$this->Plugins()->RunHook('filter.folders-post', array($oAccount, $oFolderCollection)); $this->Plugins()->RunHook('filter.folders-post', array($oAccount, $oFolderCollection));
$oSettingsLocal = $this->SettingsProvider(true)->Load($oAccount);
$aSystemFolders = array(); $aSystemFolders = array();
$this->recFoldersTypes($oAccount, $oFolderCollection, $aSystemFolders); $this->recFoldersTypes($oAccount, $oFolderCollection, $aSystemFolders);
@ -226,7 +224,7 @@ trait Folders
$oFolder = $this->MailClient()->FolderCreate( $oFolder = $this->MailClient()->FolderCreate(
$this->GetActionParam('Folder', ''), $this->GetActionParam('Folder', ''),
$this->GetActionParam('Parent', ''), $this->GetActionParam('Parent', ''),
!!$this->GetActionParam('Subscribe', !!$this->Config()->Get('labs', 'use_imap_list_subscribe', true)) !!$this->GetActionParam('Subscribe', 1)
); );
// FolderInformation(string $sFolderName, int $iPrevUidNext = 0, array $aUids = array()) // FolderInformation(string $sFolderName, int $iPrevUidNext = 0, array $aUids = array())
@ -331,7 +329,7 @@ trait Folders
$this->MailClient()->FolderMove( $this->MailClient()->FolderMove(
$this->GetActionParam('Folder', ''), $this->GetActionParam('Folder', ''),
$this->GetActionParam('NewFolder', ''), $this->GetActionParam('NewFolder', ''),
!!$this->Config()->Get('labs', 'use_imap_list_subscribe', true) !!$this->GetActionParam('Subscribe', 1)
); );
} }
catch (\Throwable $oException) catch (\Throwable $oException)
@ -355,7 +353,7 @@ trait Folders
$sFullName = $this->MailClient()->FolderRename( $sFullName = $this->MailClient()->FolderRename(
$this->GetActionParam('Folder', ''), $this->GetActionParam('Folder', ''),
$sName, $sName,
!!$this->Config()->Get('labs', 'use_imap_list_subscribe', true) !!$this->GetActionParam('Subscribe', 1)
); );
} }
catch (\Throwable $oException) catch (\Throwable $oException)
@ -379,10 +377,7 @@ trait Folders
try try
{ {
$this->MailClient()->FolderDelete( $this->MailClient()->FolderDelete($this->GetActionParam('Folder', ''));
$this->GetActionParam('Folder', ''),
!!$this->Config()->Get('labs', 'use_imap_list_subscribe', true)
);
} }
catch (\MailSo\Mail\Exceptions\NonEmptyFolder $oException) catch (\MailSo\Mail\Exceptions\NonEmptyFolder $oException)
{ {

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

@ -338,7 +338,6 @@ Enables caching in the system'),
'use_app_debug_css' => array(false), 'use_app_debug_css' => array(false),
'use_imap_sort' => array(true), 'use_imap_sort' => array(true),
'use_imap_force_selection' => array(false), 'use_imap_force_selection' => array(false),
'use_imap_list_subscribe' => array(true),
'use_imap_thread' => array(true), 'use_imap_thread' => array(true),
'use_imap_move' => array(false), 'use_imap_move' => array(false),
'use_imap_expunge_all_on_delete' => array(false), 'use_imap_expunge_all_on_delete' => array(false),

2
snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderCreate.html
View file

@ -15,7 +15,7 @@
autofocus="" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" autofocus="" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
data-bind="textInput: folderName, onEnter: createFolderCommand" /> data-bind="textInput: folderName, onEnter: createFolderCommand" />
</div> </div>
<div class="control-group" data-bind="visible: useImapSubscribe, component: { <div class="control-group" data-bind="component: {
name: 'Checkbox', name: 'Checkbox',
params: { params: {
label: 'SETTINGS_FOLDERS/BUTTON_SUBSCRIBE', label: 'SETTINGS_FOLDERS/BUTTON_SUBSCRIBE',

2
snappymail/v/0.0.0/app/templates/Views/User/SettingsFolders.html
View file

@ -3,7 +3,7 @@
&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
<i class="icon-spinner" style="margin-top: 5px" data-bind="visible: loading"></i> <i class="icon-spinner" style="margin-top: 5px" data-bind="visible: loading"></i>
</div> </div>
<div style="border-bottom: 1px solid rgba(128,128,128,0.5);margin-bottom:20px;" data-bind="visible: useImapSubscribe, component: { <div style="border-bottom: 1px solid rgba(128,128,128,0.5);margin-bottom:20px;" data-bind="component: {
name: 'Checkbox', name: 'Checkbox',
params: { params: {
label: 'SETTINGS_FOLDERS/HIDE_UNSUBSCRIBED', label: 'SETTINGS_FOLDERS/HIDE_UNSUBSCRIBED',