aboutsummaryrefslogtreecommitdiffstats
path: root/apps/settings
diff options
context:
space:
mode:
Diffstat (limited to 'apps/settings')
-rw-r--r--apps/settings/lib/Controller/MailSettingsController.php2
-rw-r--r--apps/settings/lib/Settings/Admin/Mail.php1
-rw-r--r--apps/settings/templates/settings/admin/additional-mail.php33
-rw-r--r--apps/settings/tests/Controller/MailSettingsControllerTest.php4
-rw-r--r--apps/settings/tests/Settings/Admin/MailTest.php2
5 files changed, 3 insertions, 39 deletions
diff --git a/apps/settings/lib/Controller/MailSettingsController.php b/apps/settings/lib/Controller/MailSettingsController.php
index 22c0622a072..2df79b67731 100644
--- a/apps/settings/lib/Controller/MailSettingsController.php
+++ b/apps/settings/lib/Controller/MailSettingsController.php
@@ -85,7 +85,6 @@ class MailSettingsController extends Controller {
* @param string $mail_smtpmode
* @param string $mail_smtpsecure
* @param string $mail_smtphost
- * @param string $mail_smtpauthtype
* @param int $mail_smtpauth
* @param string $mail_smtpport
* @return DataResponse
@@ -95,7 +94,6 @@ class MailSettingsController extends Controller {
$mail_smtpmode,
$mail_smtpsecure,
$mail_smtphost,
- $mail_smtpauthtype,
$mail_smtpauth,
$mail_smtpport,
$mail_sendmailmode) {
diff --git a/apps/settings/lib/Settings/Admin/Mail.php b/apps/settings/lib/Settings/Admin/Mail.php
index f4c546b27a4..1cdb7315713 100644
--- a/apps/settings/lib/Settings/Admin/Mail.php
+++ b/apps/settings/lib/Settings/Admin/Mail.php
@@ -61,7 +61,6 @@ class Mail implements IDelegatedSettings {
'mail_smtpsecure' => $this->config->getSystemValue('mail_smtpsecure', ''),
'mail_smtphost' => $this->config->getSystemValue('mail_smtphost', ''),
'mail_smtpport' => $this->config->getSystemValue('mail_smtpport', ''),
- 'mail_smtpauthtype' => $this->config->getSystemValue('mail_smtpauthtype', ''),
'mail_smtpauth' => $this->config->getSystemValue('mail_smtpauth', false),
'mail_smtpname' => $this->config->getSystemValue('mail_smtpname', ''),
'mail_smtppassword' => $this->config->getSystemValue('mail_smtppassword', ''),
diff --git a/apps/settings/templates/settings/admin/additional-mail.php b/apps/settings/templates/settings/admin/additional-mail.php
index 6b85fcbe867..6b31ebe879c 100644
--- a/apps/settings/templates/settings/admin/additional-mail.php
+++ b/apps/settings/templates/settings/admin/additional-mail.php
@@ -24,17 +24,9 @@
/** @var \OCP\IL10N $l */
/** @var array $_ */
-$mail_smtpauthtype = [
- '' => $l->t('None'),
- 'LOGIN' => $l->t('Login'),
- 'PLAIN' => $l->t('Plain'),
- 'NTLM' => $l->t('NT LAN Manager'),
-];
-
$mail_smtpsecure = [
'' => $l->t('None'),
- 'ssl' => $l->t('SSL/TLS'),
- 'tls' => $l->t('STARTTLS'),
+ 'ssl' => $l->t('SSL/TLS')
];
$mail_smtpmode = [
@@ -112,26 +104,7 @@ $mail_sendmailmode = [
value="<?php p($_['mail_domain']) ?>" />
</p>
- <p id="setting_smtpauth" <?php if ($_['mail_smtpmode'] !== 'smtp') {
- print_unescaped(' class="hidden"');
- } ?>>
- <label for="mail_smtpauthtype"><?php p($l->t('Authentication method')); ?></label>
- <select name="mail_smtpauthtype" id="mail_smtpauthtype">
- <?php foreach ($mail_smtpauthtype as $authtype => $name):
- $selected = '';
- if ($authtype == $_['mail_smtpauthtype']):
- $selected = 'selected="selected"';
- endif; ?>
- <option value="<?php p($authtype)?>" <?php p($selected) ?>><?php p($name) ?></option>
- <?php endforeach;?>
- </select>
-
- <input type="checkbox" name="mail_smtpauth" id="mail_smtpauth" class="checkbox" value="1"
- <?php if ($_['mail_smtpauth']) {
- print_unescaped('checked="checked"');
- } ?> />
- <label for="mail_smtpauth"><?php p($l->t('Authentication required')); ?></label>
- </p>
+<!--lo-->
<p id="setting_smtphost" <?php if ($_['mail_smtpmode'] !== 'smtp') {
print_unescaped(' class="hidden"');
@@ -145,7 +118,7 @@ $mail_sendmailmode = [
</p>
</form>
<form class="mail_settings" id="mail_credentials_settings">
- <p id="mail_credentials" <?php if (!$_['mail_smtpauth'] || $_['mail_smtpmode'] !== 'smtp') {
+ <p id="mail_credentials" <?php if ($_['mail_smtpmode'] !== 'smtp') {
print_unescaped(' class="hidden"');
} ?>>
<label for="mail_smtpname"><?php p($l->t('Credentials')); ?></label>
diff --git a/apps/settings/tests/Controller/MailSettingsControllerTest.php b/apps/settings/tests/Controller/MailSettingsControllerTest.php
index 54461201201..db6043030d3 100644
--- a/apps/settings/tests/Controller/MailSettingsControllerTest.php
+++ b/apps/settings/tests/Controller/MailSettingsControllerTest.php
@@ -91,7 +91,6 @@ class MailSettingsControllerTest extends \Test\TestCase {
'mail_smtpmode' => 'smtp',
'mail_smtpsecure' => 'ssl',
'mail_smtphost' => 'mx.nextcloud.org',
- 'mail_smtpauthtype' => 'NTLM',
'mail_smtpauth' => 1,
'mail_smtpport' => '25',
'mail_sendmailmode' => null,
@@ -102,7 +101,6 @@ class MailSettingsControllerTest extends \Test\TestCase {
'mail_smtpmode' => 'smtp',
'mail_smtpsecure' => 'ssl',
'mail_smtphost' => 'mx.nextcloud.org',
- 'mail_smtpauthtype' => 'NTLM',
'mail_smtpauth' => null,
'mail_smtpport' => '25',
'mail_smtpname' => null,
@@ -118,7 +116,6 @@ class MailSettingsControllerTest extends \Test\TestCase {
'smtp',
'ssl',
'mx.nextcloud.org',
- 'NTLM',
1,
'25',
null
@@ -132,7 +129,6 @@ class MailSettingsControllerTest extends \Test\TestCase {
'smtp',
'ssl',
'mx.nextcloud.org',
- 'NTLM',
0,
'25',
null
diff --git a/apps/settings/tests/Settings/Admin/MailTest.php b/apps/settings/tests/Settings/Admin/MailTest.php
index 7a70065ff50..c3b08a9d509 100644
--- a/apps/settings/tests/Settings/Admin/MailTest.php
+++ b/apps/settings/tests/Settings/Admin/MailTest.php
@@ -64,7 +64,6 @@ class MailTest extends TestCase {
['mail_smtpsecure', '', true],
['mail_smtphost', '', 'smtp.nextcloud.com'],
['mail_smtpport', '', 25],
- ['mail_smtpauthtype', '', 'login'],
['mail_smtpauth', false, true],
['mail_smtpname', '', 'smtp.sender.com'],
['mail_smtppassword', '', 'mypassword'],
@@ -82,7 +81,6 @@ class MailTest extends TestCase {
'mail_smtpsecure' => true,
'mail_smtphost' => 'smtp.nextcloud.com',
'mail_smtpport' => 25,
- 'mail_smtpauthtype' => 'login',
'mail_smtpauth' => true,
'mail_smtpname' => 'smtp.sender.com',
'mail_smtppassword' => '********',