diff --git a/dev/View/Popup/Domain.js b/dev/View/Popup/Domain.js index 11432b1ce..a3a0f6287 100644 --- a/dev/View/Popup/Domain.js +++ b/dev/View/Popup/Domain.js @@ -20,17 +20,34 @@ const host: oDomain.imapHost(), port: oDomain.imapPort(), secure: pInt(oDomain.imapType()), + timeout: oDomain.imapTimeout(), shortLogin: !!oDomain.imapShortLogin(), ssl: { verify_peer: !!oDomain.imapSslVerify_peer(), verify_peer_name: !!oDomain.imapSslVerify_peer(), allow_self_signed: !!oDomain.imapSslAllow_self_signed() - } + }, + disable_list_status: !!oDomain.imapDisable_list_status(), + disable_metadata: !!oDomain.imapDisable_metadata(), + disable_move: !!oDomain.imapDisable_move(), + disable_sort: !!oDomain.imapDisable_sort(), + disable_thread: !!oDomain.imapDisable_thread(), + folder_list_limit: pInt(oDomain.imapFolder_list_limit()), + message_list_limit: pInt(oDomain.imapMessage_list_limit()) +/* + expunge_all_on_delete: , + fast_simple_search: , + fetch_new_messages: , + force_select: , + message_all_headers: , + search_filter: +*/ }, SMTP: { host: oDomain.smtpHost(), port: oDomain.smtpPort(), secure: pInt(oDomain.smtpType()), + timeout: oDomain.smtpTimeout(), shortLogin: !!oDomain.smtpShortLogin(), ssl: { verify_peer: !!oDomain.smtpSslVerify_peer(), @@ -46,6 +63,7 @@ const host: oDomain.sieveHost(), port: oDomain.sievePort(), secure: pInt(oDomain.sieveType()), + timeout: oDomain.sieveTimeout(), shortLogin: !!oDomain.imapShortLogin(), ssl: { verify_peer: !!oDomain.imapSslVerify_peer(), @@ -302,19 +320,36 @@ export class DomainPopupView extends AbstractViewPopup { imapHost: '', imapPort: 143, imapType: 0, + imapTimeout: 300, imapShortLogin: false, // SSL imapSslVerify_peer: false, imapSslAllow_self_signed: false, + // Options + imapDisable_list_status: false, + imapDisable_metadata: false, + imapDisable_move: false, + imapDisable_sort: false, + imapDisable_thread: false, + imapExpunge_all_on_delete: false, + imapFast_simple_search: true, + imapFetch_new_messages: true, + imapForce_select: false, + imapFolder_list_limit: 200, + imapMessage_all_headers: false, + imapMessage_list_limit: 0, + imapSearch_filter: '', sieveEnabled: false, sieveHost: '', sievePort: 4190, sieveType: 0, + sieveTimeout: 10, smtpHost: '', smtpPort: 25, smtpType: 0, + smtpTimeout: 60, smtpShortLogin: false, smtpUseAuth: true, smtpSetSender: false, diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Settings.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Settings.php index 0075a8781..bcfcc0e70 100644 --- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Settings.php +++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Settings.php @@ -34,14 +34,48 @@ class Settings extends \MailSo\Net\ConnectSettings $message_all_headers = false; public int -// $body_text_limit = 555000, - $message_list_limit = 0, + $body_text_limit = 0, $folder_list_limit = 200, + $message_list_limit = 0, $thread_limit = 50; public string $search_filter = ''; + public static function fromArray(array $aSettings) : self + { + $object = parent::fromArray($aSettings); + $options = [ + 'disable_list_status', + 'disable_metadata', + 'disable_move', + 'disable_sort', + 'disable_thread', + 'expunge_all_on_delete', + 'fast_simple_search', + 'fetch_new_messages', + 'force_select', + 'message_all_headers' + ]; + foreach ($options as $option) { + if (isset($aSettings[$option])) { + $object->$option = !empty($aSettings[$option]); + } + } + $options = [ +// 'body_text_limit', + 'folder_list_limit', + 'message_list_limit', +// 'thread_limit', + ]; + foreach ($options as $option) { + if (isset($aSettings[$option])) { + $object->$option = \intval($aSettings[$option]); + } + } + return $object; + } + #[\ReturnTypeWillChange] public function jsonSerialize() { @@ -61,7 +95,8 @@ class Settings extends \MailSo\Net\ConnectSettings 'force_select' => $this->force_select, 'message_all_headers' => $this->message_all_headers, 'message_list_limit' => $this->message_list_limit, - 'search_filter' => $this->message_list_filter + 'search_filter' => $this->search_filter, +// 'thread_limit' => $this->thread_limit ] ); } diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php index e616cae59..f722a7048 100644 --- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php +++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php @@ -119,7 +119,7 @@ class MailClient * @throws \MailSo\Net\Exceptions\* * @throws \MailSo\Imap\Exceptions\* */ - public function Message(string $sFolderName, int $iIndex, bool $bIndexIsUid = true, ?\MailSo\Cache\CacheClient $oCacher = null, int $iBodyTextLimit = 0) : ?Message + public function Message(string $sFolderName, int $iIndex, bool $bIndexIsUid = true, ?\MailSo\Cache\CacheClient $oCacher = null) : ?Message { if (!\MailSo\Base\Validator::RangeInt($iIndex, 1)) { @@ -140,6 +140,8 @@ class MailClient $this->getEnvelopeOrHeadersRequestString() ); + $iBodyTextLimit = $this->oImapClient->Settings->body_text_limit; + $aFetchResponse = $this->oImapClient->Fetch(array(FetchType::BODYSTRUCTURE), $iIndex, $bIndexIsUid); if (\count($aFetchResponse) && isset($aFetchResponse[0])) { @@ -149,11 +151,9 @@ class MailClient foreach ($oBodyStructure->GetHtmlAndPlainParts() as $oPart) { $sLine = FetchType::BODY_PEEK.'['.$oPart->PartID().']'; - if (0 < $iBodyTextLimit && $iBodyTextLimit < $oPart->Size()) - { + if (0 < $iBodyTextLimit && $iBodyTextLimit < $oPart->Size()) { $sLine .= "<0.{$iBodyTextLimit}>"; } - $aFetchItems[] = $sLine; } /* 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 1be982631..fcdf57b3a 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 @@ -450,10 +450,7 @@ trait Messages try { - $oMessage = $this->MailClient()->Message($sFolder, $iUid, true, - $this->cacherForThreads(), - (int) $this->Config()->Get('imap', 'body_text_limit', 0) - ); + $oMessage = $this->MailClient()->Message($sFolder, $iUid, true, $this->cacherForThreads()); } catch (\Throwable $oException) { 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 6f5a5106f..bd7151c3f 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 @@ -359,21 +359,12 @@ Enables caching in the system'), ), 'imap' => array( - 'use_sort' => array(true), 'use_force_selection' => array(false), - 'use_thread' => array(true), - 'use_move' => array(true), 'use_expunge_all_on_delete' => array(false), - 'body_text_limit' => array(555000), 'message_list_fast_simple_search' => array(true), - 'message_list_count_limit_trigger' => array(0), 'message_list_permanent_filter' => array(''), 'message_all_headers' => array(false), - 'folder_list_limit' => array(200), 'show_login_alert' => array(true), - 'use_list_status' => array(true), - 'timeout' => array(300), - 'disable_metadata' => array(false), ), 'labs' => array( @@ -389,10 +380,8 @@ Enables caching in the system'), 'use_app_debug_js' => array(false), 'use_app_debug_css' => array(false), 'smtp_show_server_errors' => array(false), - 'smtp_timeout' => array(60), 'sieve_auth_plain_initial' => array(true), 'sieve_allow_fileinto_inbox' => array(false), - 'sieve_timeout' => array(10), 'sasl_allow_plain' => array(true), 'sasl_allow_scram_sha' => array(false), 'sasl_allow_cram_md5' => array(false), diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php index 67c2f6f42..cfa7f3551 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php @@ -218,19 +218,13 @@ abstract class Account implements \JsonSerializable $oSettings->timeout = \max($oSettings->timeout, (int) $oConfig->Get('imap', 'timeout', $oSettings->timeout)); $oSettings->Login = $this->IncLogin(); - $oSettings->disable_list_status |= !$oConfig->Get('imap', 'use_list_status', true); - $oSettings->disable_metadata |= !!$oConfig->Get('imap', 'disable_metadata', false); - $oSettings->disable_move |= !$oConfig->Get('imap', 'use_move', true); - $oSettings->disable_sort |= !$oConfig->Get('imap', 'use_sort', true); - $oSettings->disable_thread |= !$oConfig->Get('imap', 'use_thread', true); $oSettings->expunge_all_on_delete |= !!$oConfig->Get('imap', 'use_expunge_all_on_delete', false); $oSettings->fast_simple_search = !(!$oSettings->fast_simple_search || !$oConfig->Get('imap', 'message_list_fast_simple_search', true)); $oSettings->fetch_new_messages = !(!$oSettings->fetch_new_messages || !$oConfig->Get('labs', 'check_new_messages', true)); $oSettings->force_select |= !!$oConfig->Get('imap', 'use_force_selection', false); - $oSettings->folder_list_limit = \min($oSettings->folder_list_limit, (int) $oConfig->Get('imap', 'folder_list_limit', 200)); $oSettings->message_all_headers |= !!$oConfig->Get('imap', 'message_all_headers', false); - $oSettings->message_list_limit = \max($oSettings->message_list_limit, (int) $oConfig->Get('imap', 'message_list_count_limit_trigger', 0)); $oSettings->search_filter = $oSettings->search_filter ?: \trim($oConfig->Get('imap', 'message_list_permanent_filter', '')); +// $oSettings->body_text_limit = \min($oSettings->body_text_limit, (int) $oConfig->Get('imap', 'body_text_limit', 50)); // $oSettings->thread_limit = \min($oSettings->thread_limit, (int) $oConfig->Get('imap', 'large_thread_limit', 50)); $oPlugins->RunHook('imap.before-connect', array($this, $oImapClient, $oSettings)); @@ -243,7 +237,6 @@ abstract class Account implements \JsonSerializable public function SmtpConnectAndLoginHelper(\RainLoop\Plugins\Manager $oPlugins, \MailSo\Smtp\SmtpClient $oSmtpClient, \RainLoop\Config\Application $oConfig, bool &$bUsePhpMail = false) : bool { $oSettings = $this->Domain()->SmtpSettings(); - $oSettings->timeout = \max($oSettings->timeout, (int) $oConfig->Get('labs', 'smtp_timeout', $oSettings->timeout)); $oSettings->Login = $this->OutLogin(); $oSettings->usePhpMail = $bUsePhpMail; $oSettings->Ehlo = \MailSo\Smtp\SmtpClient::EhloHelper(); @@ -263,7 +256,6 @@ abstract class Account implements \JsonSerializable public function SieveConnectAndLoginHelper(\RainLoop\Plugins\Manager $oPlugins, \MailSo\Sieve\SieveClient $oSieveClient, \RainLoop\Config\Application $oConfig) { $oSettings = $this->Domain()->SieveSettings(); - $oSettings->timeout = \max($oSettings->timeout, (int) $oConfig->Get('labs', 'sieve_timeout', $oSettings->timeout)); $oSettings->Login = $this->IncLogin(); $oPlugins->RunHook('sieve.before-connect', array($this, $oSieveClient, $oSettings)); diff --git a/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json b/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json index 4cff69f51..fa61bbad6 100644 --- a/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json +++ b/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json @@ -120,12 +120,14 @@ "TITLE_EDIT_DOMAIN": "Editovat Doménu \"%NAME%\"", "LABEL_NAME": "Název", "NAME_HELPER": "wildcard podporovány", - "LABEL_IMAP": "IMAP", - "LABEL_SMTP": "SMTP", - "LABEL_SIEVE": "SIEVE", "LABEL_SERVER": "Server", "LABEL_PORT": "Port", "LABEL_SECURE": "Zabezpečení", + "TIMEOUT": "Timeout", + "DISABLE_CAPABILITIES": "Disable capabilities", + "LIMITS": "Limits", + "FOLDERS": "Folders", + "MESSAGES": "Messages", "LABEL_WHITE_LIST": "White List", "SECURE_OPTION_NONE": "Žádné", "SECURE_OPTION_SSL": "SSL\/TLS", diff --git a/snappymail/v/0.0.0/app/localization/da-DK/admin.json b/snappymail/v/0.0.0/app/localization/da-DK/admin.json index 3738205c3..fa5366df2 100644 --- a/snappymail/v/0.0.0/app/localization/da-DK/admin.json +++ b/snappymail/v/0.0.0/app/localization/da-DK/admin.json @@ -120,12 +120,14 @@ "TITLE_EDIT_DOMAIN": "Rediger domæne \"%NAME%\"", "LABEL_NAME": "Navn", "NAME_HELPER": "specieltegn understøttet", - "LABEL_IMAP": "IMAP", - "LABEL_SMTP": "SMTP", - "LABEL_SIEVE": "SIEVE", "LABEL_SERVER": "Server", "LABEL_PORT": "Port", "LABEL_SECURE": "Sikker", + "TIMEOUT": "Timeout", + "DISABLE_CAPABILITIES": "Disable capabilities", + "LIMITS": "Limits", + "FOLDERS": "Folders", + "MESSAGES": "Messages", "LABEL_WHITE_LIST": "Whitelist", "SECURE_OPTION_NONE": "Ingen", "SECURE_OPTION_SSL": "SSL\/TLS", diff --git a/snappymail/v/0.0.0/app/localization/de-DE/admin.json b/snappymail/v/0.0.0/app/localization/de-DE/admin.json index 3eb59756c..5b5a1b0b2 100644 --- a/snappymail/v/0.0.0/app/localization/de-DE/admin.json +++ b/snappymail/v/0.0.0/app/localization/de-DE/admin.json @@ -120,12 +120,14 @@ "TITLE_EDIT_DOMAIN": "Domain \"%NAME%\" bearbeiten", "LABEL_NAME": "Name", "NAME_HELPER": "Platzhalter unterstützt", - "LABEL_IMAP": "IMAP", - "LABEL_SMTP": "SMTP", - "LABEL_SIEVE": "SIEVE", "LABEL_SERVER": "Server", "LABEL_PORT": "Port", "LABEL_SECURE": "Sicherheit", + "TIMEOUT": "Timeout", + "DISABLE_CAPABILITIES": "Disable capabilities", + "LIMITS": "Limits", + "FOLDERS": "Folders", + "MESSAGES": "Messages", "LABEL_WHITE_LIST": "Whitelist", "SECURE_OPTION_NONE": "Ohne", "SECURE_OPTION_SSL": "SSL\/TLS", diff --git a/snappymail/v/0.0.0/app/localization/en/admin.json b/snappymail/v/0.0.0/app/localization/en/admin.json index b8246b803..3f670ed90 100644 --- a/snappymail/v/0.0.0/app/localization/en/admin.json +++ b/snappymail/v/0.0.0/app/localization/en/admin.json @@ -120,12 +120,14 @@ "TITLE_EDIT_DOMAIN": "Edit Domain \"%NAME%\"", "LABEL_NAME": "Name", "NAME_HELPER": "wildcard supported", - "LABEL_IMAP": "IMAP", - "LABEL_SMTP": "SMTP", - "LABEL_SIEVE": "SIEVE", "LABEL_SERVER": "Server", "LABEL_PORT": "Port", "LABEL_SECURE": "Secure", + "TIMEOUT": "Timeout", + "DISABLE_CAPABILITIES": "Disable capabilities", + "LIMITS": "Limits", + "FOLDERS": "Folders", + "MESSAGES": "Messages", "LABEL_WHITE_LIST": "White List", "SECURE_OPTION_NONE": "None", "SECURE_OPTION_SSL": "SSL\/TLS", diff --git a/snappymail/v/0.0.0/app/localization/es-ES/admin.json b/snappymail/v/0.0.0/app/localization/es-ES/admin.json index 2751bcf33..0fa88916a 100644 --- a/snappymail/v/0.0.0/app/localization/es-ES/admin.json +++ b/snappymail/v/0.0.0/app/localization/es-ES/admin.json @@ -120,12 +120,14 @@ "TITLE_EDIT_DOMAIN": "Editar \"&NAME&\"", "LABEL_NAME": "Nombre", "NAME_HELPER": "wildcards soportados", - "LABEL_IMAP": "IMAP", - "LABEL_SMTP": "SMTP", - "LABEL_SIEVE": "FILTRO", "LABEL_SERVER": "Servidor", "LABEL_PORT": "Puerto", "LABEL_SECURE": "Seguridad", + "TIMEOUT": "Timeout", + "DISABLE_CAPABILITIES": "Disable capabilities", + "LIMITS": "Limits", + "FOLDERS": "Folders", + "MESSAGES": "Messages", "LABEL_WHITE_LIST": "Lista blanca", "SECURE_OPTION_NONE": "Ninguno", "SECURE_OPTION_SSL": "SSL\/TLS", diff --git a/snappymail/v/0.0.0/app/localization/eu/admin.json b/snappymail/v/0.0.0/app/localization/eu/admin.json index 2737f643b..aa26d596d 100644 --- a/snappymail/v/0.0.0/app/localization/eu/admin.json +++ b/snappymail/v/0.0.0/app/localization/eu/admin.json @@ -120,12 +120,14 @@ "TITLE_EDIT_DOMAIN": "Editatu Domeinua \"%NAME%\"", "LABEL_NAME": "Izena", "NAME_HELPER": "komodina onartuta", - "LABEL_IMAP": "IMAP", - "LABEL_SMTP": "SMTP", - "LABEL_SIEVE": "SIEVE", "LABEL_SERVER": "Zerbitzaria", "LABEL_PORT": "Portua", "LABEL_SECURE": "Segurtasuna", + "TIMEOUT": "Timeout", + "DISABLE_CAPABILITIES": "Disable capabilities", + "LIMITS": "Limits", + "FOLDERS": "Folders", + "MESSAGES": "Messages", "LABEL_WHITE_LIST": "Zerrenda Zuria", "SECURE_OPTION_NONE": "Bat ere ez", "SECURE_OPTION_SSL": "SSL\/TLS", diff --git a/snappymail/v/0.0.0/app/localization/fa-IR/admin.json b/snappymail/v/0.0.0/app/localization/fa-IR/admin.json index e99b706a9..e056953a7 100644 --- a/snappymail/v/0.0.0/app/localization/fa-IR/admin.json +++ b/snappymail/v/0.0.0/app/localization/fa-IR/admin.json @@ -120,12 +120,14 @@ "TITLE_EDIT_DOMAIN": "ویرایش دامنه \"%NAME%\"", "LABEL_NAME": "نام", "NAME_HELPER": "پشتیبانی از wildcard", - "LABEL_IMAP": "IMAP", - "LABEL_SMTP": "SMTP", - "LABEL_SIEVE": "SIEVE", "LABEL_SERVER": "سرور", "LABEL_PORT": "پورت", "LABEL_SECURE": "امن", + "TIMEOUT": "Timeout", + "DISABLE_CAPABILITIES": "Disable capabilities", + "LIMITS": "Limits", + "FOLDERS": "Folders", + "MESSAGES": "Messages", "LABEL_WHITE_LIST": "لیست سفید", "SECURE_OPTION_NONE": "هیچ‌کدام", "SECURE_OPTION_SSL": "SSL\/TLS", diff --git a/snappymail/v/0.0.0/app/localization/fi-FI/admin.json b/snappymail/v/0.0.0/app/localization/fi-FI/admin.json index 2b85e658f..6a3b2b393 100644 --- a/snappymail/v/0.0.0/app/localization/fi-FI/admin.json +++ b/snappymail/v/0.0.0/app/localization/fi-FI/admin.json @@ -120,12 +120,14 @@ "TITLE_EDIT_DOMAIN": "Muokkaa verkkotunnusta \"%NAME%\"", "LABEL_NAME": "Nimi", "NAME_HELPER": "wildcard tuettu", - "LABEL_IMAP": "IMAP", - "LABEL_SMTP": "SMTP", - "LABEL_SIEVE": "SIEVE", "LABEL_SERVER": "Palvelin", "LABEL_PORT": "Portti", "LABEL_SECURE": "Secure", + "TIMEOUT": "Timeout", + "DISABLE_CAPABILITIES": "Disable capabilities", + "LIMITS": "Limits", + "FOLDERS": "Folders", + "MESSAGES": "Messages", "LABEL_WHITE_LIST": "Sallitut Lista", "SECURE_OPTION_NONE": "Ei mitään", "SECURE_OPTION_SSL": "SSL\/TLS", diff --git a/snappymail/v/0.0.0/app/localization/fr-FR/admin.json b/snappymail/v/0.0.0/app/localization/fr-FR/admin.json index e9ad33ff5..a143adb5c 100644 --- a/snappymail/v/0.0.0/app/localization/fr-FR/admin.json +++ b/snappymail/v/0.0.0/app/localization/fr-FR/admin.json @@ -120,12 +120,14 @@ "TITLE_EDIT_DOMAIN": "Modifier le domaine \"%NAME%\"", "LABEL_NAME": "Nom", "NAME_HELPER": "Caractères jokers autorisés", - "LABEL_IMAP": "IMAP", - "LABEL_SMTP": "SMTP", - "LABEL_SIEVE": "SIEVE", "LABEL_SERVER": "Serveur", "LABEL_PORT": "Port", "LABEL_SECURE": "Sécurité", + "TIMEOUT": "Timeout", + "DISABLE_CAPABILITIES": "Disable capabilities", + "LIMITS": "Limits", + "FOLDERS": "Folders", + "MESSAGES": "Messages", "LABEL_WHITE_LIST": "Liste Blanche", "SECURE_OPTION_NONE": "Aucun", "SECURE_OPTION_SSL": "SSL\/TLS", diff --git a/snappymail/v/0.0.0/app/localization/hu-HU/admin.json b/snappymail/v/0.0.0/app/localization/hu-HU/admin.json index 8ee5e0f3d..d21a71030 100644 --- a/snappymail/v/0.0.0/app/localization/hu-HU/admin.json +++ b/snappymail/v/0.0.0/app/localization/hu-HU/admin.json @@ -120,12 +120,14 @@ "TITLE_EDIT_DOMAIN": "\"%NAME%\" domain szerkesztése", "LABEL_NAME": "Név", "NAME_HELPER": "helyettesítő karakter használható", - "LABEL_IMAP": "IMAP", - "LABEL_SMTP": "SMTP", - "LABEL_SIEVE": "SIEVE", "LABEL_SERVER": "Szerver", "LABEL_PORT": "Port", "LABEL_SECURE": "Biztonság", + "TIMEOUT": "Timeout", + "DISABLE_CAPABILITIES": "Disable capabilities", + "LIMITS": "Limits", + "FOLDERS": "Folders", + "MESSAGES": "Messages", "LABEL_WHITE_LIST": "Fehér lista", "SECURE_OPTION_NONE": "Semmi", "SECURE_OPTION_SSL": "SSL\/TLS", diff --git a/snappymail/v/0.0.0/app/localization/id-ID/admin.json b/snappymail/v/0.0.0/app/localization/id-ID/admin.json index 80b5658d6..8aaacef97 100644 --- a/snappymail/v/0.0.0/app/localization/id-ID/admin.json +++ b/snappymail/v/0.0.0/app/localization/id-ID/admin.json @@ -120,12 +120,14 @@ "TITLE_EDIT_DOMAIN": "Ubah Domain \"%NAME%\"", "LABEL_NAME": "Nama", "NAME_HELPER": "Mendukung Wildcard", - "LABEL_IMAP": "IMAP", - "LABEL_SMTP": "SMTP", - "LABEL_SIEVE": "SIEVE", "LABEL_SERVER": "Server", "LABEL_PORT": "Port", "LABEL_SECURE": "Aman", + "TIMEOUT": "Timeout", + "DISABLE_CAPABILITIES": "Disable capabilities", + "LIMITS": "Limits", + "FOLDERS": "Folders", + "MESSAGES": "Messages", "LABEL_WHITE_LIST": "Daftar Putih", "SECURE_OPTION_NONE": "Tidak satupun", "SECURE_OPTION_SSL": "SSL\/TLS", diff --git a/snappymail/v/0.0.0/app/localization/it-IT/admin.json b/snappymail/v/0.0.0/app/localization/it-IT/admin.json index e39a6a3b1..7278b05d6 100644 --- a/snappymail/v/0.0.0/app/localization/it-IT/admin.json +++ b/snappymail/v/0.0.0/app/localization/it-IT/admin.json @@ -120,12 +120,14 @@ "TITLE_EDIT_DOMAIN": "Edit Domain \"%NAME%\"", "LABEL_NAME": "Name", "NAME_HELPER": "wildcard supported", - "LABEL_IMAP": "IMAP", - "LABEL_SMTP": "SMTP", - "LABEL_SIEVE": "SIEVE", "LABEL_SERVER": "Server", "LABEL_PORT": "Port", "LABEL_SECURE": "Secure", + "TIMEOUT": "Timeout", + "DISABLE_CAPABILITIES": "Disable capabilities", + "LIMITS": "Limits", + "FOLDERS": "Folders", + "MESSAGES": "Messages", "LABEL_WHITE_LIST": "White List", "SECURE_OPTION_NONE": "None", "SECURE_OPTION_SSL": "SSL\/TLS", diff --git a/snappymail/v/0.0.0/app/localization/ja-JP/admin.json b/snappymail/v/0.0.0/app/localization/ja-JP/admin.json index 6ac59661c..edf3dc685 100644 --- a/snappymail/v/0.0.0/app/localization/ja-JP/admin.json +++ b/snappymail/v/0.0.0/app/localization/ja-JP/admin.json @@ -120,12 +120,14 @@ "TITLE_EDIT_DOMAIN": "ドメイン\"%NAME%\"を編集", "LABEL_NAME": "名前", "NAME_HELPER": "ワイルドカード利用可", - "LABEL_IMAP": "IMAP", - "LABEL_SMTP": "SMTP", - "LABEL_SIEVE": "SIEVE", "LABEL_SERVER": "サーバー", "LABEL_PORT": "ポート", "LABEL_SECURE": "セキュリティ", + "TIMEOUT": "Timeout", + "DISABLE_CAPABILITIES": "Disable capabilities", + "LIMITS": "Limits", + "FOLDERS": "Folders", + "MESSAGES": "Messages", "LABEL_WHITE_LIST": "ホワイトリスト", "SECURE_OPTION_NONE": "なし", "SECURE_OPTION_SSL": "SSL\/TLS", diff --git a/snappymail/v/0.0.0/app/localization/lt-LT/admin.json b/snappymail/v/0.0.0/app/localization/lt-LT/admin.json index 00cce1e37..de51f738a 100644 --- a/snappymail/v/0.0.0/app/localization/lt-LT/admin.json +++ b/snappymail/v/0.0.0/app/localization/lt-LT/admin.json @@ -120,12 +120,14 @@ "TITLE_EDIT_DOMAIN": "Redaguoti Domeną \"%NAME%\"", "LABEL_NAME": "Pavadinimas", "NAME_HELPER": "wildcard palaikymas", - "LABEL_IMAP": "IMAP", - "LABEL_SMTP": "SMTP", - "LABEL_SIEVE": "SIEVE", "LABEL_SERVER": "Serveris", "LABEL_PORT": "Prievadas", "LABEL_SECURE": "Sauga", + "TIMEOUT": "Timeout", + "DISABLE_CAPABILITIES": "Disable capabilities", + "LIMITS": "Limits", + "FOLDERS": "Folders", + "MESSAGES": "Messages", "LABEL_WHITE_LIST": "Baltas Sąrašas", "SECURE_OPTION_NONE": "Nėra", "SECURE_OPTION_SSL": "SSL\/TLS", diff --git a/snappymail/v/0.0.0/app/localization/nb-NO/admin.json b/snappymail/v/0.0.0/app/localization/nb-NO/admin.json index cd86c17b4..0709df92f 100644 --- a/snappymail/v/0.0.0/app/localization/nb-NO/admin.json +++ b/snappymail/v/0.0.0/app/localization/nb-NO/admin.json @@ -120,12 +120,14 @@ "TITLE_EDIT_DOMAIN": "Rediger «%NAME%»", "LABEL_NAME": "Navn", "NAME_HELPER": "jokertegn støttes", - "LABEL_IMAP": "IMAP", - "LABEL_SMTP": "SMTP", - "LABEL_SIEVE": "SIEVE", "LABEL_SERVER": "Tjener", "LABEL_PORT": "Port", "LABEL_SECURE": "Sikker", + "TIMEOUT": "Timeout", + "DISABLE_CAPABILITIES": "Disable capabilities", + "LIMITS": "Limits", + "FOLDERS": "Folders", + "MESSAGES": "Messages", "LABEL_WHITE_LIST": "Hvitliste", "SECURE_OPTION_NONE": "None", "SECURE_OPTION_SSL": "SSL\/TLS", diff --git a/snappymail/v/0.0.0/app/localization/nl-NL/admin.json b/snappymail/v/0.0.0/app/localization/nl-NL/admin.json index 0a501d1cf..6c9d1e75f 100644 --- a/snappymail/v/0.0.0/app/localization/nl-NL/admin.json +++ b/snappymail/v/0.0.0/app/localization/nl-NL/admin.json @@ -120,12 +120,14 @@ "TITLE_EDIT_DOMAIN": "Pas domein \"%NAME%\" aan", "LABEL_NAME": "Naam", "NAME_HELPER": "ondersteunt joker tekens", - "LABEL_IMAP": "IMAP", - "LABEL_SMTP": "SMTP", - "LABEL_SIEVE": "SIEVE", "LABEL_SERVER": "Server", "LABEL_PORT": "Poort", "LABEL_SECURE": "Encryptie", + "TIMEOUT": "Timeout", + "DISABLE_CAPABILITIES": "Disable capabilities", + "LIMITS": "Limits", + "FOLDERS": "Folders", + "MESSAGES": "Messages", "LABEL_WHITE_LIST": "Witte lijst", "SECURE_OPTION_NONE": "Geen", "SECURE_OPTION_SSL": "SSL\/TLS", diff --git a/snappymail/v/0.0.0/app/localization/pl-PL/admin.json b/snappymail/v/0.0.0/app/localization/pl-PL/admin.json index e23df2592..0c83e3a94 100644 --- a/snappymail/v/0.0.0/app/localization/pl-PL/admin.json +++ b/snappymail/v/0.0.0/app/localization/pl-PL/admin.json @@ -120,12 +120,14 @@ "TITLE_EDIT_DOMAIN": "Edycja domeny „%NAME%”", "LABEL_NAME": "Nazwa", "NAME_HELPER": "obsługiwany znak wieloznaczności - *", - "LABEL_IMAP": "IMAP", - "LABEL_SMTP": "SMTP", - "LABEL_SIEVE": "SIEVE", "LABEL_SERVER": "Serwer", "LABEL_PORT": "Port", "LABEL_SECURE": "Rodzaj połączenia", + "TIMEOUT": "Timeout", + "DISABLE_CAPABILITIES": "Disable capabilities", + "LIMITS": "Limits", + "FOLDERS": "Folders", + "MESSAGES": "Messages", "LABEL_WHITE_LIST": "Biała lista", "SECURE_OPTION_NONE": "Bez zabezpieczeń", "SECURE_OPTION_SSL": "SSL\/TLS", diff --git a/snappymail/v/0.0.0/app/localization/pt-BR/admin.json b/snappymail/v/0.0.0/app/localization/pt-BR/admin.json index dba7cfe84..8ae5eb1ab 100644 --- a/snappymail/v/0.0.0/app/localization/pt-BR/admin.json +++ b/snappymail/v/0.0.0/app/localization/pt-BR/admin.json @@ -120,12 +120,14 @@ "TITLE_EDIT_DOMAIN": "Editar Domínio \"%NAME%\"", "LABEL_NAME": "Domínio", "NAME_HELPER": "curinga (wildcard) suportado", - "LABEL_IMAP": "IMAP", - "LABEL_SMTP": "SMTP", - "LABEL_SIEVE": "SIEVE", "LABEL_SERVER": "Servidor", "LABEL_PORT": "Porta", "LABEL_SECURE": "Criptografia", + "TIMEOUT": "Timeout", + "DISABLE_CAPABILITIES": "Disable capabilities", + "LIMITS": "Limits", + "FOLDERS": "Folders", + "MESSAGES": "Messages", "LABEL_WHITE_LIST": "Lista branca", "SECURE_OPTION_NONE": "Nenhuma", "SECURE_OPTION_SSL": "SSL\/TLS", diff --git a/snappymail/v/0.0.0/app/localization/pt-PT/admin.json b/snappymail/v/0.0.0/app/localization/pt-PT/admin.json index 2888da31f..6d06dd763 100644 --- a/snappymail/v/0.0.0/app/localization/pt-PT/admin.json +++ b/snappymail/v/0.0.0/app/localization/pt-PT/admin.json @@ -120,12 +120,14 @@ "TITLE_EDIT_DOMAIN": "Editar domínio \"%NAME%\"", "LABEL_NAME": "Nome", "NAME_HELPER": "caracter universal suportado", - "LABEL_IMAP": "IMAP", - "LABEL_SMTP": "SMTP", - "LABEL_SIEVE": "SIEVE", "LABEL_SERVER": "Servidor", "LABEL_PORT": "Porta", "LABEL_SECURE": "Segurança", + "TIMEOUT": "Timeout", + "DISABLE_CAPABILITIES": "Disable capabilities", + "LIMITS": "Limits", + "FOLDERS": "Folders", + "MESSAGES": "Messages", "LABEL_WHITE_LIST": "Lista Branca", "SECURE_OPTION_NONE": "Nenhuma", "SECURE_OPTION_SSL": "SSL\/TLS", diff --git a/snappymail/v/0.0.0/app/localization/pt/admin.json b/snappymail/v/0.0.0/app/localization/pt/admin.json index 2888da31f..6d06dd763 100644 --- a/snappymail/v/0.0.0/app/localization/pt/admin.json +++ b/snappymail/v/0.0.0/app/localization/pt/admin.json @@ -120,12 +120,14 @@ "TITLE_EDIT_DOMAIN": "Editar domínio \"%NAME%\"", "LABEL_NAME": "Nome", "NAME_HELPER": "caracter universal suportado", - "LABEL_IMAP": "IMAP", - "LABEL_SMTP": "SMTP", - "LABEL_SIEVE": "SIEVE", "LABEL_SERVER": "Servidor", "LABEL_PORT": "Porta", "LABEL_SECURE": "Segurança", + "TIMEOUT": "Timeout", + "DISABLE_CAPABILITIES": "Disable capabilities", + "LIMITS": "Limits", + "FOLDERS": "Folders", + "MESSAGES": "Messages", "LABEL_WHITE_LIST": "Lista Branca", "SECURE_OPTION_NONE": "Nenhuma", "SECURE_OPTION_SSL": "SSL\/TLS", diff --git a/snappymail/v/0.0.0/app/localization/ru-RU/admin.json b/snappymail/v/0.0.0/app/localization/ru-RU/admin.json index cf4dbaf98..082c22b6b 100644 --- a/snappymail/v/0.0.0/app/localization/ru-RU/admin.json +++ b/snappymail/v/0.0.0/app/localization/ru-RU/admin.json @@ -120,12 +120,14 @@ "TITLE_EDIT_DOMAIN": "Редактировать домен \"%NAME%\"", "LABEL_NAME": "Имя", "NAME_HELPER": "wildcard supported", - "LABEL_IMAP": "IMAP", - "LABEL_SMTP": "SMTP", - "LABEL_SIEVE": "SIEVE", "LABEL_SERVER": "Сервер", "LABEL_PORT": "Порт", "LABEL_SECURE": "Безопасность", + "TIMEOUT": "Timeout", + "DISABLE_CAPABILITIES": "Disable capabilities", + "LIMITS": "Limits", + "FOLDERS": "Folders", + "MESSAGES": "Messages", "LABEL_WHITE_LIST": "Белый список", "SECURE_OPTION_NONE": "Нет", "SECURE_OPTION_SSL": "SSL\/TLS", diff --git a/snappymail/v/0.0.0/app/localization/sk-SK/admin.json b/snappymail/v/0.0.0/app/localization/sk-SK/admin.json index fe87cd306..b52d984fd 100644 --- a/snappymail/v/0.0.0/app/localization/sk-SK/admin.json +++ b/snappymail/v/0.0.0/app/localization/sk-SK/admin.json @@ -120,12 +120,14 @@ "TITLE_EDIT_DOMAIN": "Upraviť doménu \"%NAME%\"", "LABEL_NAME": "Meno", "NAME_HELPER": "wildcard supported", - "LABEL_IMAP": "IMAP", - "LABEL_SMTP": "SMTP", - "LABEL_SIEVE": "SIEVE", "LABEL_SERVER": "Server", "LABEL_PORT": "Port", "LABEL_SECURE": "Bezpečné", + "TIMEOUT": "Timeout", + "DISABLE_CAPABILITIES": "Disable capabilities", + "LIMITS": "Limits", + "FOLDERS": "Folders", + "MESSAGES": "Messages", "LABEL_WHITE_LIST": "Zoznam povolených", "SECURE_OPTION_NONE": "Žiadne", "SECURE_OPTION_SSL": "SSL\/TLS", diff --git a/snappymail/v/0.0.0/app/localization/sl-SI/admin.json b/snappymail/v/0.0.0/app/localization/sl-SI/admin.json index 0c4038169..07e1c848d 100644 --- a/snappymail/v/0.0.0/app/localization/sl-SI/admin.json +++ b/snappymail/v/0.0.0/app/localization/sl-SI/admin.json @@ -120,12 +120,14 @@ "TITLE_EDIT_DOMAIN": "Urejanje domene \"%NAME%\"", "LABEL_NAME": "Ime", "NAME_HELPER": "podpora za nadomestne znake", - "LABEL_IMAP": "IMAP", - "LABEL_SMTP": "SMTP", - "LABEL_SIEVE": "SIEVE", "LABEL_SERVER": "Strežnik", "LABEL_PORT": "Vrata", "LABEL_SECURE": "Varno", + "TIMEOUT": "Timeout", + "DISABLE_CAPABILITIES": "Disable capabilities", + "LIMITS": "Limits", + "FOLDERS": "Folders", + "MESSAGES": "Messages", "LABEL_WHITE_LIST": "Bela lista", "SECURE_OPTION_NONE": "Nobeno", "SECURE_OPTION_SSL": "SSL\/TLS", diff --git a/snappymail/v/0.0.0/app/localization/sv-SE/admin.json b/snappymail/v/0.0.0/app/localization/sv-SE/admin.json index d9d7d60c0..9ba5b1545 100644 --- a/snappymail/v/0.0.0/app/localization/sv-SE/admin.json +++ b/snappymail/v/0.0.0/app/localization/sv-SE/admin.json @@ -120,12 +120,14 @@ "TITLE_EDIT_DOMAIN": "Ändra domän \"%NAME%\"", "LABEL_NAME": "Namn", "NAME_HELPER": "jokertecken stöds", - "LABEL_IMAP": "IMAP", - "LABEL_SMTP": "SMTP", - "LABEL_SIEVE": "SIEVE", "LABEL_SERVER": "Server", "LABEL_PORT": "Port", "LABEL_SECURE": "Säkerhet", + "TIMEOUT": "Timeout", + "DISABLE_CAPABILITIES": "Disable capabilities", + "LIMITS": "Limits", + "FOLDERS": "Folders", + "MESSAGES": "Messages", "LABEL_WHITE_LIST": "Vitlista", "SECURE_OPTION_NONE": "Ingen", "SECURE_OPTION_SSL": "SSL\/TLS", diff --git a/snappymail/v/0.0.0/app/localization/vi-VN/admin.json b/snappymail/v/0.0.0/app/localization/vi-VN/admin.json index 82e851cfb..e4e6c86f4 100644 --- a/snappymail/v/0.0.0/app/localization/vi-VN/admin.json +++ b/snappymail/v/0.0.0/app/localization/vi-VN/admin.json @@ -120,12 +120,14 @@ "TITLE_EDIT_DOMAIN": "Chỉnh sửa tên miền \"%NAME%\"", "LABEL_NAME": "Tên", "NAME_HELPER": "Có hỗ trợ wildcard", - "LABEL_IMAP": "IMAP", - "LABEL_SMTP": "SMTP", - "LABEL_SIEVE": "SIEVE", "LABEL_SERVER": "Máy chủ", "LABEL_PORT": "Cổng", "LABEL_SECURE": "An ninh", + "TIMEOUT": "Timeout", + "DISABLE_CAPABILITIES": "Disable capabilities", + "LIMITS": "Limits", + "FOLDERS": "Folders", + "MESSAGES": "Messages", "LABEL_WHITE_LIST": "Danh sách trắng", "SECURE_OPTION_NONE": "Không có", "SECURE_OPTION_SSL": "SSL\/TLS", diff --git a/snappymail/v/0.0.0/app/localization/zh-CN/admin.json b/snappymail/v/0.0.0/app/localization/zh-CN/admin.json index c8308a1f0..7c65d2af4 100644 --- a/snappymail/v/0.0.0/app/localization/zh-CN/admin.json +++ b/snappymail/v/0.0.0/app/localization/zh-CN/admin.json @@ -120,12 +120,14 @@ "TITLE_EDIT_DOMAIN": "编辑域名 \"%NAME%\"", "LABEL_NAME": "名字", "NAME_HELPER": "支持通配符", - "LABEL_IMAP": "IMAP", - "LABEL_SMTP": "SMTP", - "LABEL_SIEVE": "SIEVE", "LABEL_SERVER": "服务器", "LABEL_PORT": "端口", "LABEL_SECURE": "加密", + "TIMEOUT": "Timeout", + "DISABLE_CAPABILITIES": "Disable capabilities", + "LIMITS": "Limits", + "FOLDERS": "Folders", + "MESSAGES": "Messages", "LABEL_WHITE_LIST": "白名单", "SECURE_OPTION_NONE": "无", "SECURE_OPTION_SSL": "SSL\/TLS", diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html index bf8318a4b..3e45bd494 100644 --- a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html +++ b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html @@ -21,16 +21,16 @@ + >IMAP
-
+

-
+

-
+

- + +
+
+ +
+

@@ -72,22 +76,76 @@ label: 'TAB_SECURITY/LABEL_ALLOW_SELF_SIGNED' } }">
+ +

+
+
+
+
+
+ +

+
+ + +
+
+ + +
+
+ >SMTP