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

Remove unused startup_url

Browse source
This commit is contained in:
djmaze 2021-12-07 16:51:09 +01:00
parent 3a61bb3e5a
commit df293960d0
5 changed files with 4 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.docker/release/files/usr/local/include/application.ini
View file

@ -222,10 +222,10 @@ http_expires = 3600
server_uids = On server_uids = On
[labs] [labs]
allow_prefetch = On allow_prefetch = Off
cache_system_data = On cache_system_data = On
date_from_headers = On date_from_headers = On
autocreate_system_folders = On autocreate_system_folders = Off
allow_message_append = Off allow_message_append = Off
login_fault_delay = 1 login_fault_delay = 1
log_ajax_response_write_limit = 300 log_ajax_response_write_limit = 300
@ -284,7 +284,6 @@ cookie_default_path = ""
cookie_default_secure = Off cookie_default_secure = Off
check_new_messages = On check_new_messages = On
replace_env_in_configuration = "" replace_env_in_configuration = ""
startup_url = ""
strict_html_parser = Off strict_html_parser = Off
boundary_prefix = "" boundary_prefix = ""
kolab_enabled = Off kolab_enabled = Off

4
dev/App/User.js
View file

@ -38,7 +38,6 @@ import {
import { import {
mailBox, mailBox,
root,
openPgpWorkerJs, openPgpWorkerJs,
openPgpJs openPgpJs
} from 'Common/Links'; } from 'Common/Links';
@ -724,9 +723,6 @@ class AppUser extends AbstractApp {
this.foldersReload(value => { this.foldersReload(value => {
try { try {
if (value) { if (value) {
value = pString(SettingsGet('StartupUrl'));
value && rl.route.setHash(root(value), true);
startScreens([ startScreens([
MailBoxUserScreen, MailBoxUserScreen,
SettingsUserScreen SettingsUserScreen

2
dev/View/User/SystemDropDown.js
View file

@ -75,8 +75,6 @@ export class SystemDropDownUserView extends AbstractViewRight {
// FolderUserStore.folderList([]); // FolderUserStore.folderList([]);
Remote.foldersReload(value => { Remote.foldersReload(value => {
if (value) { if (value) {
value = SettingsGet('StartupUrl');
rl.route.setHash(root(value), true);
// 4. Change to INBOX = reload MessageList // 4. Change to INBOX = reload MessageList
// MessageUserStore.setMessageList(); // MessageUserStore.setMessageList();
} }

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

@ -820,7 +820,6 @@ class Actions
'LoginDefaultDomain' => $oConfig->Get('login', 'default_domain', ''), 'LoginDefaultDomain' => $oConfig->Get('login', 'default_domain', ''),
'DetermineUserLanguage' => (bool)$oConfig->Get('login', 'determine_user_language', true), 'DetermineUserLanguage' => (bool)$oConfig->Get('login', 'determine_user_language', true),
'DetermineUserDomain' => (bool)$oConfig->Get('login', 'determine_user_domain', false), '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), 'SieveAllowFileintoInbox' => (bool)$oConfig->Get('labs', 'sieve_allow_fileinto_inbox', false),
'ContactsIsAllowed' => false, 'ContactsIsAllowed' => false,
'Admin' => array(), 'Admin' => array(),
@ -947,10 +946,6 @@ class Actions
$oSettings = $this->SettingsProvider()->Load($oAccount); $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()); $aResult['MainEmail'] = \MailSo\Base\Utils::IdnToUtf8($this->getMainAccountFromToken()->Email());
$oSettingsLocal = $this->SettingsProvider(true)->Load($oAccount); $oSettingsLocal = $this->SettingsProvider(true)->Load($oAccount);
@ -1010,8 +1005,6 @@ class Actions
$aResult['DevEmail'] = $oConfig->Get('labs', 'dev_email', ''); $aResult['DevEmail'] = $oConfig->Get('labs', 'dev_email', '');
$aResult['DevPassword'] = $oConfig->Get('labs', 'dev_password', ''); $aResult['DevPassword'] = $oConfig->Get('labs', 'dev_password', '');
$aResult['StartupUrl'] = '';
if (empty($aResult['AdditionalLoginError'])) { if (empty($aResult['AdditionalLoginError'])) {
$aResult['AdditionalLoginError'] = $this->GetSpecLogoutCustomMgsWithDeletion(); $aResult['AdditionalLoginError'] = $this->GetSpecLogoutCustomMgsWithDeletion();
} }

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

@ -313,10 +313,10 @@ Enables caching in the system'),
), ),
'labs' => array( 'labs' => array(
'allow_prefetch' => array(true), 'allow_prefetch' => array(false),
'cache_system_data' => array(true), 'cache_system_data' => array(true),
'date_from_headers' => array(true), 'date_from_headers' => array(true),
'autocreate_system_folders' => array(true), 'autocreate_system_folders' => array(false),
'allow_message_append' => array(false), 'allow_message_append' => array(false),
'login_fault_delay' => array(1), 'login_fault_delay' => array(1),
'log_ajax_response_write_limit' => array(300), 'log_ajax_response_write_limit' => array(300),
@ -374,7 +374,6 @@ Enables caching in the system'),
'cookie_default_secure' => array(false), 'cookie_default_secure' => array(false),
'check_new_messages' => array(true), 'check_new_messages' => array(true),
'replace_env_in_configuration' => array(''), 'replace_env_in_configuration' => array(''),
'startup_url' => array(''),
'strict_html_parser' => array(false), 'strict_html_parser' => array(false),
'boundary_prefix' => array(''), 'boundary_prefix' => array(''),
'kolab_enabled' => array(false), 'kolab_enabled' => array(false),