diff --git a/dev/View/Popup/Domain.js b/dev/View/Popup/Domain.js index d2535f8b2..6e8a261f1 100644 --- a/dev/View/Popup/Domain.js +++ b/dev/View/Popup/Domain.js @@ -57,6 +57,7 @@ const smtpShortLogin: false, smtpUseAuth: true, smtpSetSender: false, + smtpAuthPlainLine: false, smtpUsePhpMail: false, // SSL smtpSslVerify_peer: false, @@ -106,6 +107,7 @@ const allow_self_signed: !!oDomain.smtpSslAllow_self_signed() }, setSender: !!oDomain.smtpSetSender(), + authPlainLine: !!oDomain.smtpAuthPlainLine(), useAuth: !!oDomain.smtpUseAuth(), usePhpMail: !!oDomain.smtpUsePhpMail() }, diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Settings.php b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Settings.php index dccc7a487..de25b99cd 100644 --- a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Settings.php +++ b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Settings.php @@ -24,6 +24,8 @@ class Settings extends \MailSo\Net\ConnectSettings public bool $setSender = false, $usePhpMail = false, + // https://github.com/the-djmaze/snappymail/issues/1038 + $authPlainLine = false, $viewErrors = false; public string $Ehlo; @@ -41,6 +43,7 @@ class Settings extends \MailSo\Net\ConnectSettings $object->useAuth = !empty($aSettings['useAuth']); $object->setSender = !empty($aSettings['setSender']); $object->usePhpMail = !empty($aSettings['usePhpMail']); + $object->authPlainLine = !empty($aSettings['authPlainLine']); // $object->viewErrors = !empty($aSettings['viewErrors']); return $object; } @@ -54,7 +57,8 @@ class Settings extends \MailSo\Net\ConnectSettings // '@Object' => 'Object/SmtpSettings', 'useAuth' => $this->useAuth, 'setSender' => $this->setSender, - 'usePhpMail' => $this->usePhpMail + 'usePhpMail' => $this->usePhpMail, + 'authPlainLine' => $this->authPlainLine // 'viewErrors' => $this->viewErrors ] ); diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php index fc7dd3c81..706165c4d 100644 --- a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php +++ b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php @@ -133,60 +133,76 @@ class SmtpClient extends \MailSo\Net\NetClient $this->writeLogException(new \MailSo\Smtp\Exceptions\LoginBadMethodException); } - $SASL = \SnappyMail\SASL::factory($type); - $SASL->base64 = true; - - // Start authentication - try - { - $sResult = $this->sendRequestWithCheck('AUTH', 334, $type); - } - catch (\MailSo\Smtp\Exceptions\NegativeResponseException $oException) - { - $this->writeLogException( - new \MailSo\Smtp\Exceptions\LoginBadMethodException($oException->GetResponses(), $oException->getMessage(), 0, $oException) - ); - } - - try - { - if (\str_starts_with($type, 'SCRAM-')) { - // RFC 5802 - $sResult = $this->sendRequestWithCheck($SASL->authenticate($sLogin, $sPassword, $sResult), 234, ''); - $sChallenge = $SASL->challenge($sResult); - $this->oLogger && $this->oLogger->AddSecret($sChallenge); - $SASL->verify($this->sendRequestWithCheck($sChallenge, 235, '', true)); - } else switch ($type) { - // RFC 4616 - case 'PLAIN': - case 'XOAUTH2': - case 'OAUTHBEARER': - $sAuth = $SASL->authenticate($sLogin, $sPassword); - $this->oLogger && $this->oLogger->AddSecret($sAuth); - $this->sendRequestWithCheck($sAuth, 235, '', true); - break; - - case 'LOGIN': - $sResult = $this->sendRequestWithCheck($SASL->authenticate($sLogin, $sPassword, $sResult), 334, ''); - $sPassword = $SASL->challenge($sResult); - $this->oLogger && $this->oLogger->AddSecret($sPassword); - $this->sendRequestWithCheck($sPassword, 235, '', true); - break; - - // RFC 2195 - case 'CRAM-MD5': - if (empty($sResult)) { - $this->writeLogException(new \MailSo\Smtp\Exceptions\NegativeResponseException); - } - $this->sendRequestWithCheck($SASL->authenticate($sLogin, $sPassword, $sResult), 235, '', true); - break; + if ($this->Settings->authPlainLine) { + // https://github.com/the-djmaze/snappymail/issues/1038 + $SASL = \SnappyMail\SASL::factory('PLAIN'); + $SASL->base64 = true; + try + { + $sResult = $this->sendRequestWithCheck('AUTH', 235, 'PLAIN ' . $SASL->authenticate($sLogin, $sPassword)); + } + catch (\MailSo\Smtp\Exceptions\NegativeResponseException $oException) + { + $this->writeLogException( + new \MailSo\Smtp\Exceptions\LoginBadCredentialsException($oException->GetResponses(), $oException->getMessage(), 0, $oException) + ); + } + } else { + // Start authentication + $SASL = \SnappyMail\SASL::factory($type); + $SASL->base64 = true; + + try + { + $sResult = $this->sendRequestWithCheck('AUTH', 334, $type); + } + catch (\MailSo\Smtp\Exceptions\NegativeResponseException $oException) + { + $this->writeLogException( + new \MailSo\Smtp\Exceptions\LoginBadMethodException($oException->GetResponses(), $oException->getMessage(), 0, $oException) + ); + } + + try + { + if (\str_starts_with($type, 'SCRAM-')) { + // RFC 5802 + $sResult = $this->sendRequestWithCheck($SASL->authenticate($sLogin, $sPassword, $sResult), 234, ''); + $sChallenge = $SASL->challenge($sResult); + $this->oLogger && $this->oLogger->AddSecret($sChallenge); + $SASL->verify($this->sendRequestWithCheck($sChallenge, 235, '', true)); + } else switch ($type) { + // RFC 4616 + case 'PLAIN': + case 'XOAUTH2': + case 'OAUTHBEARER': + $sAuth = $SASL->authenticate($sLogin, $sPassword); + $this->oLogger && $this->oLogger->AddSecret($sAuth); + $this->sendRequestWithCheck($sAuth, 235, '', true); + break; + + case 'LOGIN': + $sResult = $this->sendRequestWithCheck($SASL->authenticate($sLogin, $sPassword, $sResult), 334, ''); + $sPassword = $SASL->challenge($sResult); + $this->oLogger && $this->oLogger->AddSecret($sPassword); + $this->sendRequestWithCheck($sPassword, 235, '', true); + break; + + // RFC 2195 + case 'CRAM-MD5': + if (empty($sResult)) { + $this->writeLogException(new \MailSo\Smtp\Exceptions\NegativeResponseException); + } + $this->sendRequestWithCheck($SASL->authenticate($sLogin, $sPassword, $sResult), 235, '', true); + break; + } + } + catch (\MailSo\Smtp\Exceptions\NegativeResponseException $oException) + { + $this->writeLogException( + new \MailSo\Smtp\Exceptions\LoginBadCredentialsException($oException->GetResponses(), $oException->getMessage(), 0, $oException) + ); } - } - catch (\MailSo\Smtp\Exceptions\NegativeResponseException $oException) - { - $this->writeLogException( - new \MailSo\Smtp\Exceptions\LoginBadCredentialsException($oException->GetResponses(), $oException->getMessage(), 0, $oException) - ); } $this->bIsLoggined = true; diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Domain.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Domain.php index c90e98e4d..16479d7f0 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Domain.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Domain.php @@ -244,6 +244,7 @@ class Domain implements \JsonSerializable $oDomain->SMTP->shortLogin = !empty($aDomain['smtpShortLogin']); $oDomain->SMTP->useAuth = !empty($aDomain['smtpAuth']); $oDomain->SMTP->setSender = !empty($aDomain['smtpSetSender']); + $oDomain->SMTP->authPlainLine = !empty($aDomain['smtpAuthPlainLine']); $oDomain->SMTP->usePhpMail = !empty($aDomain['smtpPhpMail']); $oDomain->whiteList = (string) $aDomain['whiteList']; 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 f038d9f48..68f8dce38 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 @@ -135,6 +135,7 @@ "LABEL_USE_SHORT_LOGIN": "Používat krátký login", "LABEL_USE_AUTH": "Používat autorizaci", "LABEL_SET_SENDER": "Use login as sender", + "LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login", "LABEL_USE_PHP_MAIL": "Používat php mail() funkci", "BUTTON_WHITE_LIST": "White List", "BUTTON_SIEVE_CONFIGURATION": "SIEVE konfigurace", 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 cd06f7627..cf90f9b6a 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 @@ -135,6 +135,7 @@ "LABEL_USE_SHORT_LOGIN": "Brug kort log ind", "LABEL_USE_AUTH": "Brug godkendelse", "LABEL_SET_SENDER": "Use login as sender", + "LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login", "LABEL_USE_PHP_MAIL": "Brug php mail()", "BUTTON_WHITE_LIST": "Whitelist", "BUTTON_SIEVE_CONFIGURATION": "Sieve opsætning", 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 fb0797385..e8ea3f1f0 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 @@ -135,6 +135,7 @@ "LABEL_USE_SHORT_LOGIN": "Kurze Benutzernamen verwenden", "LABEL_USE_AUTH": "Authentifizierung verwenden", "LABEL_SET_SENDER": "Verwenden Sie die Anmeldung als Absender", + "LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login", "LABEL_USE_PHP_MAIL": "PHPs mail()-Funktion verwenden", "BUTTON_WHITE_LIST": "Whitelist", "BUTTON_SIEVE_CONFIGURATION": "Sieve-Konfiguration", 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 d98ae3c69..890698e23 100644 --- a/snappymail/v/0.0.0/app/localization/en/admin.json +++ b/snappymail/v/0.0.0/app/localization/en/admin.json @@ -135,6 +135,7 @@ "LABEL_USE_SHORT_LOGIN": "Use short login", "LABEL_USE_AUTH": "Use authentication", "LABEL_SET_SENDER": "Use login as sender", + "LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login", "LABEL_USE_PHP_MAIL": "Use php mail() function", "BUTTON_WHITE_LIST": "White List", "BUTTON_SIEVE_CONFIGURATION": "Sieve configuration", 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 1dbd06834..3293bd14a 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 @@ -135,6 +135,7 @@ "LABEL_USE_SHORT_LOGIN": "Inicio de Sesión corto", "LABEL_USE_AUTH": "Usar autenticación", "LABEL_SET_SENDER": "Usar inicio de sesión como remitente", + "LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login", "LABEL_USE_PHP_MAIL": "Utilizar la función mail() de PHP", "BUTTON_WHITE_LIST": "Lista blanca", "BUTTON_SIEVE_CONFIGURATION": "Configuraciones de Filtro", 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 f7479071a..54176219b 100644 --- a/snappymail/v/0.0.0/app/localization/eu/admin.json +++ b/snappymail/v/0.0.0/app/localization/eu/admin.json @@ -135,6 +135,7 @@ "LABEL_USE_SHORT_LOGIN": "Erabili login motza", "LABEL_USE_AUTH": "Erabili autentikazioa", "LABEL_SET_SENDER": "Erabili logina bidaltzaile bezala", + "LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login", "LABEL_USE_PHP_MAIL": "Erabili php mail() funtzioa", "BUTTON_WHITE_LIST": "Zerrenda Zuria", "BUTTON_SIEVE_CONFIGURATION": "Sieve ezarpenak", 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 7e7fc2744..50a582025 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 @@ -135,6 +135,7 @@ "LABEL_USE_SHORT_LOGIN": "استفاده از ورود کوتاه بدون دامنه", "LABEL_USE_AUTH": "استفاده از احراز هویت", "LABEL_SET_SENDER": "Use login as sender", + "LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login", "LABEL_USE_PHP_MAIL": "استفاده از تابع mail() زبان PHP", "BUTTON_WHITE_LIST": "لیست سفید", "BUTTON_SIEVE_CONFIGURATION": "پیکربندی Sieve", 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 85020d543..d29e7b775 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 @@ -135,6 +135,7 @@ "LABEL_USE_SHORT_LOGIN": "Käytä lyhyttä kirjautumista", "LABEL_USE_AUTH": "Käytä tunnistautumista", "LABEL_SET_SENDER": "Use login as sender", + "LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login", "LABEL_USE_PHP_MAIL": "Käytä php mail() funktiota", "BUTTON_WHITE_LIST": "Sallitut Lista", "BUTTON_SIEVE_CONFIGURATION": "Sieve asetukset", 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 5cb3f3b12..20e9cfade 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 @@ -135,6 +135,7 @@ "LABEL_USE_SHORT_LOGIN": "Utiliser l'identifiant court", "LABEL_USE_AUTH": "Utiliser l'authentification", "LABEL_SET_SENDER": "Utiliser la connexion en tant qu'expéditeur", + "LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login", "LABEL_USE_PHP_MAIL": "Utiliser la fonction mail() de php", "BUTTON_WHITE_LIST": "Liste Blanche", "BUTTON_SIEVE_CONFIGURATION": "Configuration sieve", 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 b6ef93376..df7d58067 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 @@ -135,6 +135,7 @@ "LABEL_USE_SHORT_LOGIN": "Rövid felhasználónév használata", "LABEL_USE_AUTH": "Hitelesítés használata", "LABEL_SET_SENDER": "Use login as sender", + "LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login", "LABEL_USE_PHP_MAIL": "A PHP mail() funkció használata", "BUTTON_WHITE_LIST": "Fehér lista", "BUTTON_SIEVE_CONFIGURATION": "SIEVE beállítás", 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 11808aae1..c3ed39b8b 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 @@ -135,6 +135,7 @@ "LABEL_USE_SHORT_LOGIN": "Gunakan login singkat", "LABEL_USE_AUTH": "Gunakan otentikasi", "LABEL_SET_SENDER": "Use login as sender", + "LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login", "LABEL_USE_PHP_MAIL": "Gunakan fungsi mail() PHP", "BUTTON_WHITE_LIST": "Daftar Putih", "BUTTON_SIEVE_CONFIGURATION": "Konfigurasi Sieve", 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 6f94f3904..e8ae84622 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 @@ -135,6 +135,7 @@ "LABEL_USE_SHORT_LOGIN": "Use short login", "LABEL_USE_AUTH": "Use authentication", "LABEL_SET_SENDER": "Use login as sender", + "LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login", "LABEL_USE_PHP_MAIL": "Use php mail() function", "BUTTON_WHITE_LIST": "White List", "BUTTON_SIEVE_CONFIGURATION": "Sieve configuration", 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 2275d9d0a..c8e8487c4 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 @@ -135,6 +135,7 @@ "LABEL_USE_SHORT_LOGIN": "短いログイン名を使う", "LABEL_USE_AUTH": "認証を使用する", "LABEL_SET_SENDER": "ログイン名を送信者として使う", + "LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login", "LABEL_USE_PHP_MAIL": "PHPのmail()関数を使用する", "BUTTON_WHITE_LIST": "ホワイトリスト", "BUTTON_SIEVE_CONFIGURATION": "SIEVE設定", 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 b07f7aedc..42d2e14be 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 @@ -135,6 +135,7 @@ "LABEL_USE_SHORT_LOGIN": "Naudoti trumpą prisijungimo vardą", "LABEL_USE_AUTH": "Naudoti autentifikavimą ", "LABEL_SET_SENDER": "Use login as sender", + "LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login", "LABEL_USE_PHP_MAIL": "Naudoti php mail() funkciją", "BUTTON_WHITE_LIST": "Baltas sąrašas", "BUTTON_SIEVE_CONFIGURATION": "Sieve konfiguracija", 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 0cbb6d1cd..12eb31321 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 @@ -135,6 +135,7 @@ "LABEL_USE_SHORT_LOGIN": "Bruk forkortet brukernavn", "LABEL_USE_AUTH": "Bruk autentisering", "LABEL_SET_SENDER": "Bruk pålogging som avsender", + "LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login", "LABEL_USE_PHP_MAIL": "Bruk php-funksjonen «mail()»", "BUTTON_WHITE_LIST": "Hvitliste", "BUTTON_SIEVE_CONFIGURATION": "Sieve-oppsett", 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 c1e809da4..c16f41000 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 @@ -135,6 +135,7 @@ "LABEL_USE_SHORT_LOGIN": "Gebruik verkorte login", "LABEL_USE_AUTH": "Gebruik authenticatie", "LABEL_SET_SENDER": "Gebruik login als verzender", + "LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login", "LABEL_USE_PHP_MAIL": "Gebruik php mail() functie", "BUTTON_WHITE_LIST": "Witte lijst", "BUTTON_SIEVE_CONFIGURATION": "Sieve configuratie", 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 2377932a7..035419d56 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 @@ -135,6 +135,7 @@ "LABEL_USE_SHORT_LOGIN": "Użyj krótkiego loginu", "LABEL_USE_AUTH": "Użyj autoryzacji", "LABEL_SET_SENDER": "Use login as sender", + "LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login", "LABEL_USE_PHP_MAIL": "Użyj funkcji php 'mail()'", "BUTTON_WHITE_LIST": "Biała lista", "BUTTON_SIEVE_CONFIGURATION": "Konfiguracja sieve", 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 b36c2a707..0d40087e9 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 @@ -135,6 +135,7 @@ "LABEL_USE_SHORT_LOGIN": "Usar login curto", "LABEL_USE_AUTH": "Usar autenticação", "LABEL_SET_SENDER": "Use login as sender", + "LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login", "LABEL_USE_PHP_MAIL": "Usar função php mail()", "BUTTON_WHITE_LIST": "Lista branca", "BUTTON_SIEVE_CONFIGURATION": "Configurações Sieve", 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 dd4661f96..b7f483459 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 @@ -135,6 +135,7 @@ "LABEL_USE_SHORT_LOGIN": "Usar nome de utilizador curto", "LABEL_USE_AUTH": "Usar autenticação", "LABEL_SET_SENDER": "Usar nome de utilizador como remetente", + "LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login", "LABEL_USE_PHP_MAIL": "Usar a função php mail()", "BUTTON_WHITE_LIST": "Lista Branca", "BUTTON_SIEVE_CONFIGURATION": "Configuração SIEVE", 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 dd4661f96..b7f483459 100644 --- a/snappymail/v/0.0.0/app/localization/pt/admin.json +++ b/snappymail/v/0.0.0/app/localization/pt/admin.json @@ -135,6 +135,7 @@ "LABEL_USE_SHORT_LOGIN": "Usar nome de utilizador curto", "LABEL_USE_AUTH": "Usar autenticação", "LABEL_SET_SENDER": "Usar nome de utilizador como remetente", + "LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login", "LABEL_USE_PHP_MAIL": "Usar a função php mail()", "BUTTON_WHITE_LIST": "Lista Branca", "BUTTON_SIEVE_CONFIGURATION": "Configuração SIEVE", 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 39ee8c21b..35b8ca7a8 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 @@ -135,6 +135,7 @@ "LABEL_USE_SHORT_LOGIN": "Использовать короткий логин", "LABEL_USE_AUTH": "Использовать аутентификацию", "LABEL_SET_SENDER": "Использовать логин в качестве отправителя", + "LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login", "LABEL_USE_PHP_MAIL": "Использовать mail() функцию", "BUTTON_WHITE_LIST": "Белый список", "BUTTON_SIEVE_CONFIGURATION": "Настройки Sieve", 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 27813a812..a0afdb98b 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 @@ -135,6 +135,7 @@ "LABEL_USE_SHORT_LOGIN": "Použiť skrátené prihlásenie", "LABEL_USE_AUTH": "Použiť overenie", "LABEL_SET_SENDER": "Use login as sender", + "LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login", "LABEL_USE_PHP_MAIL": "Použiť php mail() funkciu", "BUTTON_WHITE_LIST": "Zoznam povolených", "BUTTON_SIEVE_CONFIGURATION": "Nastavenia Sieve", 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 f6bb22a72..0a0ddfb1f 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 @@ -135,6 +135,7 @@ "LABEL_USE_SHORT_LOGIN": "Uporaba uporabniškega imena brez domene", "LABEL_USE_AUTH": "Uporaba overjanja", "LABEL_SET_SENDER": "Use login as sender", + "LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login", "LABEL_USE_PHP_MAIL": "Uporaba php mail() funkcije", "BUTTON_WHITE_LIST": "Dodaj na belo listo", "BUTTON_SIEVE_CONFIGURATION": "Konfiguriraj Sieve", 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 183feb330..70e86c822 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 @@ -135,6 +135,7 @@ "LABEL_USE_SHORT_LOGIN": "Använda korta inloggning", "LABEL_USE_AUTH": "Använd autentisering", "LABEL_SET_SENDER": "Use login as sender", + "LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login", "LABEL_USE_PHP_MAIL": "Använd php mail() funktionen", "BUTTON_WHITE_LIST": "Vitlista", "BUTTON_SIEVE_CONFIGURATION": "sil-konfiguration", 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 c78292575..a9a90a172 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 @@ -135,6 +135,7 @@ "LABEL_USE_SHORT_LOGIN": "Dùng đăng nhập ngắn", "LABEL_USE_AUTH": "Dùng xác minh", "LABEL_SET_SENDER": "Dùng tên đăng nhập là email người dùng", + "LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login", "LABEL_USE_PHP_MAIL": "Dùng phương trình php mail()", "BUTTON_WHITE_LIST": "Danh sách trắng", "BUTTON_SIEVE_CONFIGURATION": "Thiết lập Sieve", 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 28b5875d0..7428c7d8b 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 @@ -135,6 +135,7 @@ "LABEL_USE_SHORT_LOGIN": "使用短用户名登录", "LABEL_USE_AUTH": "使用认证", "LABEL_SET_SENDER": "使用登录名作为发件人", + "LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login", "LABEL_USE_PHP_MAIL": "使用 php mail() 函数", "BUTTON_WHITE_LIST": "白名单", "BUTTON_SIEVE_CONFIGURATION": "筛选设置", 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 d8f29ff1f..57998244c 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 @@ -193,6 +193,13 @@ value: smtpSetSender } }"> +