diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini index 466b17d47..dbf1e4653 100644 --- a/.docker/release/files/usr/local/include/application.ini +++ b/.docker/release/files/usr/local/include/application.ini @@ -222,10 +222,10 @@ http_expires = 3600 server_uids = On [labs] -allow_prefetch = On +allow_prefetch = Off cache_system_data = On date_from_headers = On -autocreate_system_folders = On +autocreate_system_folders = Off allow_message_append = Off login_fault_delay = 1 log_ajax_response_write_limit = 300 @@ -284,7 +284,6 @@ cookie_default_path = "" cookie_default_secure = Off check_new_messages = On replace_env_in_configuration = "" -startup_url = "" strict_html_parser = Off boundary_prefix = "" kolab_enabled = Off diff --git a/dev/App/User.js b/dev/App/User.js index 8b9a99e39..f6af760a1 100644 --- a/dev/App/User.js +++ b/dev/App/User.js @@ -38,7 +38,6 @@ import { import { mailBox, - root, openPgpWorkerJs, openPgpJs } from 'Common/Links'; @@ -724,9 +723,6 @@ class AppUser extends AbstractApp { this.foldersReload(value => { try { if (value) { - value = pString(SettingsGet('StartupUrl')); - value && rl.route.setHash(root(value), true); - startScreens([ MailBoxUserScreen, SettingsUserScreen diff --git a/dev/View/User/SystemDropDown.js b/dev/View/User/SystemDropDown.js index 2e17d07b8..b2f21032b 100644 --- a/dev/View/User/SystemDropDown.js +++ b/dev/View/User/SystemDropDown.js @@ -75,8 +75,6 @@ export class SystemDropDownUserView extends AbstractViewRight { // FolderUserStore.folderList([]); Remote.foldersReload(value => { if (value) { - value = SettingsGet('StartupUrl'); - rl.route.setHash(root(value), true); // 4. Change to INBOX = reload MessageList // MessageUserStore.setMessageList(); } 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 6914ef084..5b6e579f6 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -820,7 +820,6 @@ class Actions 'LoginDefaultDomain' => $oConfig->Get('login', 'default_domain', ''), 'DetermineUserLanguage' => (bool)$oConfig->Get('login', 'determine_user_language', true), 'DetermineUserDomain' => (bool)$oConfig->Get('login', 'determine_user_domain', false), - 'StartupUrl' => \trim(\ltrim(\trim($oConfig->Get('labs', 'startup_url', '')), '#/')), 'SieveAllowFileintoInbox' => (bool)$oConfig->Get('labs', 'sieve_allow_fileinto_inbox', false), 'ContactsIsAllowed' => false, 'Admin' => array(), @@ -947,10 +946,6 @@ class Actions $oSettings = $this->SettingsProvider()->Load($oAccount); - if (!empty($aResult['StartupUrl'])) { - $aResult['StartupUrl'] = $this->compileLogParams($aResult['StartupUrl'], $oAccount, true); - } - $aResult['MainEmail'] = \MailSo\Base\Utils::IdnToUtf8($this->getMainAccountFromToken()->Email()); $oSettingsLocal = $this->SettingsProvider(true)->Load($oAccount); @@ -1010,8 +1005,6 @@ class Actions $aResult['DevEmail'] = $oConfig->Get('labs', 'dev_email', ''); $aResult['DevPassword'] = $oConfig->Get('labs', 'dev_password', ''); - $aResult['StartupUrl'] = ''; - if (empty($aResult['AdditionalLoginError'])) { $aResult['AdditionalLoginError'] = $this->GetSpecLogoutCustomMgsWithDeletion(); } 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 594a730cc..fd7192407 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 @@ -313,10 +313,10 @@ Enables caching in the system'), ), 'labs' => array( - 'allow_prefetch' => array(true), + 'allow_prefetch' => array(false), 'cache_system_data' => array(true), 'date_from_headers' => array(true), - 'autocreate_system_folders' => array(true), + 'autocreate_system_folders' => array(false), 'allow_message_append' => array(false), 'login_fault_delay' => array(1), 'log_ajax_response_write_limit' => array(300), @@ -374,7 +374,6 @@ Enables caching in the system'), 'cookie_default_secure' => array(false), 'check_new_messages' => array(true), 'replace_env_in_configuration' => array(''), - 'startup_url' => array(''), 'strict_html_parser' => array(false), 'boundary_prefix' => array(''), 'kolab_enabled' => array(false),